Mercurial > hg > xemacs-beta
view lisp/code-init.el @ 872:79c6ff3eef26
[xemacs-hg @ 2002-06-20 21:18:01 by ben]
font changes etc.; some 21.4 changes
mule/mule-msw-init-late.el: Specify charset->windows-registry conversion.
mule/mule-x-init.el: Delete extra mule font additions here. Put them in faces.c.
cl-macs.el: Document better.
font-lock.el: Move Lisp function regexp to lisp-mode.el.
lisp-mode.el: Various indentation fixes:
Handle flet functions better.
Handle argument lists in defuns and flets.
Handle quoted lists, e.g. property lists -- don't indent like
function calls. Distinguish between lambdas and other lists.
lisp-mode.el: Handle this form.
faces.el, font-menu.el, font.el, gtk-faces.el, msw-faces.el, msw-font-menu.el, x-faces.el, x-init.el: Major overhaul of face-handling code:
-- Fix lots of bogus code in msw-faces.el, msw-font-menu.el,
font-menu.el that was "truenaming" font specs -- i.e. in the
process of frobbing a particular field in a general user-specified
font spec with wildcarded fields, sticking in particular values
for all the remaining wildcarded fields. This bug was rampant
everywhere except in x-faces.el (the oldest and only correctly
written code). This also means that we need to work with font
names at all times and not font instances, because a font instance
is essentially a truenamed font.
-- Total rewrite of extremely junky code in msw-faces.el. Work
with names as well as font instances, and return names; stop
truenaming when canonicalizing and frobbing; fix handling of the
combined style field, i.e. weight/slant (also fixed in font.el).
-- Totally rewrite the frobbing functions in faces.el. This time,
we frob all the instantiators rather than just computing a single
instance value and working backwards. That way, e.g., `bold' will
work for all charsets that have bold available, rather than only
for whatever charset was part of the computed font instance
(another example of the truename virus). Also fix up code to look
at the fallbacks (all of them) when no global value present, so we
don't need to put something in the global value. Intelligently
handle a request to frob a buffer locale, rather than signalling
an error. When frobbing instantiators, try hard to figure out
what device type is associated with them, and frob each according
to its own proper device type. Correctly handle inheritance
vectors given as instantiators. Preserve existing tags when
putting back frobbed instantiators. Extract out general
specifier-frobbing code into specifier.el. Document everything
cleanly. Do lots of other things better, etc.
-- Don't duplicatively set a global specification for the default
font -- it's already in the fallback and we no longer need a
default global specification present. Delete various code in
x-faces.el and msw-faces.el that duplicated the lists of fonts in
faces.c.
-- init-global-faces was not being called at all under MS Windows!
Major bogosity. That caused device-specific values to get stuck
into all the fonts, making it very hard to change them -- setting
global specs caused nothing to happen.
-- Correct weight names in font.el.
-- Lots more font fixups in objects*.c.
Printer.el: Warning fix.
specifier.el: Add more args to map-specifier.
Add various "heuristic" specifier functions to aid in creation of
specifier-munging code such as in faces.el.
subr.el: New functions.
lwlib.c: Fix warning.
config.inc.samp: Clean up, add args to control fastcall (not yet supported! the
changes needed are in another ws of mine), profile support, vc6
support, union-type.
xemacs.dsp, xemacs.mak: Semi-major overhaul.
Fix bug where dump-id was always getting recomputed, forcing a
redump even when nothing changed.
Add support for fastcall. Support edit-and-continue (on by
default) with vc6. Use incremental linking when doing a debug
compilation. Add support for profiling.
Consolidate the various debug flags.
Partial support for "batch-compiling" -- compiling many files on a
single invocation of the compiler. Doesn't seem to help that much
for me, so it's not finished or enabled by default.
Remove HAVE_MSW_C_DIRED, we always do.
Correct some sloppy use of directories.
s/cygwin32.h: Allow pdump to work under Cygwin (mmap is broken, so need to undefine
HAVE_MMAP).
s/win32-common.h, s/windowsnt.h: Support for fastcall. Add WIN32_ANY for identifying all Win32
variants (Cygwin, native, MinGW). Both of these are properly used
in another ws.
alloc.c, balloon-x.c, buffer.c, bytecode.c, callint.c, cm.c, cmdloop.c, cmds.c, console-gtk.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console-x.h, console.c, console.h, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, device.h, devslots.h, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, editfns.c, emacs.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, extents.c, extents.h, faces.c, fileio.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gui-gtk.c, gui-msw.c, gui-x.c, gui.c, gutter.c, input-method-xlib.c, intl-encap-win32.c, intl-win32.c, keymap.c, lisp.h, macros.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, menubar.h, minibuf.c, mule-charset.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-msw.h, objects-tty.c, objects-tty.h, objects-x.c, objects-x.h, objects.c, objects.h, postgresql.c, print.c, process.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, select-gtk.c, select-msw.c, select-x.c, select.c, signal.c, sound.c, specifier.c, symbols.c, syntax.c, sysdep.c, syssignal.h, syswindows.h, toolbar-common.c, toolbar-gtk.c, toolbar-msw.c, toolbar-x.c, toolbar.c, unicode.c, window.c, window.h: The following are the major changes made:
(1) Separation of various header files into an external and an
internal version, similar to the existing separation of process.h
and procimpl.h. Eventually this should be done for all Lisp
objects. The external version has the same name as currently; the
internal adds -impl. The external file has XFOO() macros for
objects, but the structure is opaque and defined only in the
internal file. It's now reasonable to move all prototypes in
lisp.h into the appropriate external file, and this should be
done. Currently, separation has been done on extents.h,
objects*.h, console.h, device.h, frame.h, and window.h.
For c/d/f/w, the most basic properties are available in the
external header file, with the macros resolving to functions. In
the internal header file, the macros are redefined to directly
access the structure. Also, the global MARK_FOO_CHANGED macros
have been made into functions so that they can be accessed without
needing to include lots of -impl headers -- they are used in
almost exclusively in non-time-critical functions, and take up
enough time that the function overhead will be negligible.
Similarly, the function overhead from making the basic properties
mentioned above into functions is negligible, and code that does
heavy accessing of c/d/f/w structures inevitably ends up needing
the internal header files, anyway.
(2) More face changes.
-- Major rewrite of objects-msw.c. Now handles wildcard specs
properly, rather than "truenaming" (or even worse, signalling an
error, which previously happened with some of the fallbacks if you
tried to use them in make-font-instance!).
-- Split charset matching of fonts into two stages -- one to find
a font specifically designed for a particular charset (by
examining its registry), the second to find a Unicode font that
can support the charset. This needs to proceed as two complete,
separate instantiations in order to work properly (otherwise many
of the fonts in the HELLO page look wrong). This should also make
it easy to support iso10646 (Unicode) fonts under X.
-- All default values for fonts are now completely specified in
the fallbacks. Stuff from mule-x-init.el has all been moved here,
merged with the existing specs, and totally rethought so you get
sensible results. (HELLO now looks much better!).
-- Generalize the "default X/GTK device" stuff into a
per-device-type "default device".
-- Add mswindows-{set-}charset-registry. In time,
charset<->code-page conversion functions will be removed.
-- Wrap protective code around calls to compute device specifier tags,
and do this computation before calling the face initialization code
because the latter may need these tags to be correctly updated.
(3) Other changes.
EmacsFrame.c, glyphs-msw.c, eval.c, gui-x.c, intl-encap-win32.c, search.c, signal.c, toolbar-msw.c, unicode.c: Warning fixes.
config.h.in: #undefs meant to be frobbed by configure *MUST* go inside of
#ifndef WIN32_NO_CONFIGURE, and everything else *MUST* go outside!
eval.c: Let detailed backtraces be detailed.
specifier.c: Don't override user's print-string-length/print-length settings.
glyphs.c: New function image-instance-instantiator.
config.h.in, sysdep.c: Changes for fastcall.
sysdep.c, nt.c: Fix up a previous botched patch that tried to add support for both
EEXIST and EACCES. IF THE BOTCHED PATCH WENT INTO 21.4, THIS FIXUP
NEEDS TO GO IN, TOO.
search.c: Fix *evil* crash due to incorrect synching of syntax-cache code
with 21.1. THIS SHOULD GO INTO 21.4.
author | ben |
---|---|
date | Thu, 20 Jun 2002 21:19:10 +0000 |
parents | 2b6fa2618f76 |
children | 7f62a956b825 |
line wrap: on
line source
;;; code-init.el --- Handle coding system default values ;; Copyright (C) 2001, 2002 Ben Wing. ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;; Placed in a separate file so it can be loaded after the various ;; coding systems have been created, because we'll be using them at ;; load time. ;;; Code: (defcustom eol-detection-enabled-p (or (featurep 'mule) (memq system-type '(windows-nt cygwin32)) (featurep 'unix-default-eol-detection)) "True if XEmacs automatically detects the EOL type when reading files. Normally, this is always the case on Windows or when international (Mule) support is compiled into this XEmacs. Otherwise, it is currently off by default, but this may change. Don't set this; nothing will happen. Instead, use the Options menu or `set-eol-detection'." :group 'encoding :type 'boolean ;; upon initialization, we don't want the whole business of ;; set-eol-detection to be called. We will init everything appropriately ;; later in the same file, when reset-language-environment is called. :initialize #'(lambda (var val) (setq eol-detection-enabled-p val)) :set #'(lambda (var val) (set-eol-detection val) (setq eol-detection-enabled-p val))) (defun set-eol-detection (flag) "Enable (if FLAG is non-nil) or disable automatic EOL detection of files. EOL detection is enabled by default on Windows or when international (Mule) support is compiled into this XEmacs. Otherwise, it is currently off by default, but this may change. NOTE: You *REALLY* should not turn off EOL detection on Windows! Your files will have lots of annoying ^M's in them if you do this." (dolist (x '(buffer-file-coding-system-for-read keyboard default-process-coding-system-read no-conversion-coding-system-mapping)) (set-coding-system-variable x (coding-system-change-eol-conversion (get-coding-system-variable x) (if flag nil 'lf))))) (defun coding-system-current-system-configuration () (cond ((memq system-type '(windows-nt cygwin32)) (if (featurep 'mule) 'windows-mule 'windows-no-mule)) ((featurep 'mule) 'unix-mule) (eol-detection-enabled-p 'unix-no-mule-eol-detection) (t 'unix-no-mule-no-eol-detection))) (defvar coding-system-variable-default-value-table '((buffer-file-coding-system-for-read binary raw-text undecided raw-text undecided) (default-buffer-file-coding-system binary binary iso-2022-8 raw-text-dos mswindows-multibyte-dos) (file-name binary binary binary raw-text-dos mswindows-multibyte-system-default-dos) (native binary binary binary raw-text-dos mswindows-multibyte-system-default-dos) (keyboard binary raw-text undecided raw-text undecided) ;; the `terminal' coding system is used for output to stderr. such ;; streams do automatic lf->crlf encoding in the C library, so we need ;; to not do the same translations ourselves. (terminal binary binary binary binary mswindows-multibyte-unix) (default-process-coding-system-read binary raw-text undecided raw-text undecided) (default-process-coding-system-write binary binary binary raw-text mswindows-multibyte-system-default) (no-conversion-coding-system-mapping binary raw-text raw-text raw-text mswindows-multibyte) )) (defvar coding-system-default-configuration-list '(unix-no-mule-no-eol-detection unix-no-mule-eol-detection unix-mule windows-no-mule windows-mule)) (defvar coding-system-default-variable-list '(buffer-file-coding-system-for-read default-buffer-file-coding-system file-name native keyboard terminal default-process-coding-system-read default-process-coding-system-write)) (defun get-coding-system-variable (var) "Return the value of a basic coding system variable. This is intended as a uniform interface onto the coding system settings that control how encoding detection and conversion works. See `coding-system-variable-default-value' for a list of the possible values of VAR." (case var (buffer-file-coding-system-for-read buffer-file-coding-system-for-read) (default-buffer-file-coding-system (default-value 'buffer-file-coding-system)) (file-name (coding-system-aliasee 'file-name)) (native (coding-system-aliasee 'native)) (keyboard (coding-system-aliasee 'keyboard)) (terminal (coding-system-aliasee 'terminal)) (default-process-coding-system-read (car default-process-coding-system)) (default-process-coding-system-write (cdr default-process-coding-system)) (t (error 'invalid-constant "Invalid coding system variable" var)))) (defun set-coding-system-variable (var value) "Set a basic coding system variable to VALUE. This is intended as a uniform interface onto the coding system settings that control how encoding detection and conversion works. See `coding-system-variable-default-value' for a list of the possible values of VAR." (case var (buffer-file-coding-system-for-read (set-buffer-file-coding-system-for-read value)) (default-buffer-file-coding-system (set-default-buffer-file-coding-system value)) (file-name (define-coding-system-alias 'file-name value)) (native (define-coding-system-alias 'native value)) (keyboard (set-keyboard-coding-system value)) (terminal (set-terminal-coding-system value)) (default-process-coding-system-read (setq default-process-coding-system (cons value (cdr default-process-coding-system)))) (default-process-coding-system-write (setq default-process-coding-system (cons (car default-process-coding-system) value))) (t (error 'invalid-constant "Invalid coding system variable" var)))) (defun coding-system-variable-default-value (var &optional config) "Return the appropriate default value for a coding system variable. VAR specifies the variable, and CONFIG the configuration, defaulting to the current system configuration (as returned by `coding-system-current-system-configuration'). The table of default values looks like this: (see below for abbreviations) Unix Unix+EOL Unix+Mule MSW MSW+Mule ------------------------------------------------------------------------------ bfcs-for-read binary raw-text undecided raw-text undecided default bfcs binary binary iso-2022-8 raw-text-dos MSW-MB-dos file-name binary binary binary raw-text-dos MSW-MB-SD-dos native binary binary binary raw-text-dos MSW-MB-SD-dos keyboard binary raw-text undecided raw-text undecided terminal binary binary binary binary MSW-MB-unix process-read binary raw-text undecided raw-text undecided process-write binary binary binary raw-text MSW-MB-SD no-conv-cs binary raw-text raw-text raw-text MSW-MB VAR can be one of: (abbreviations in parens) `buffer-file-coding-system-for-read' (bfcs-for-read) Lisp variable of the same name; the default coding system used when reading in a file, in the absence of more specific settings. (See `insert-file-contents' for a description of exactly how a file's coding system is determined when it's read in.) `default-buffer-file-coding-system' (default bfcs) Default value of `buffer-file-coding-system', the buffer-local variable specifying a file's coding system to be used when it is written out. Set using `set-default-buffer-file-coding-system' (or the primitive `setq-default'). When a file is read in, `buffer-file-coding-system' for that file is set from the coding system used to read the file in; the default value applies to newly created files. `file-name' (file-name) The coding system named `file-name'. Changed using `define-coding-system-alias'. Used internally when passing file names to or from system API's, unless the particular API specifies another coding system. `native' (native) The coding system named `native'. Changed using `define-coding-system-alias'. Used internally when passing non-file-name text to or from system API's, unless the particular API specifies another coding system. `keyboard' (keyboard) #### fill in `terminal' (terminal) #### fill in `default-process-coding-system-read' (process-read) #### fill in `default-process-coding-system-write' (process-write) #### fill in `no-conversion-coding-system-mapping' (no-conv-cs) Coding system used when category `no-conversion' is detected. CONFIG is one of: (abbreviations in parens) `unix-no-mule-no-eol-detection' (Unix) Unix, no Mule support, no automatic EOL detection. (Controlled by `eol-detection-enabled-p', which is set by the command-line flag -enable-eol-detection or the configure flag --with-default-eol-detection.) `unix-no-mule-eol-detection' (Unix+EOL) Unix, no Mule support, automatic EOL detection. `unix-mule' (Unix+Mule) Unix, Mule support. `windows-no-mule' (MSW) MS Windows or Cygwin, no Mule support. `windows-mule'. (MSW+Mule) MS Windows or Cygwin, Mule support. The following coding system abbreviations are also used in the table: MSW-MB = mswindows-multibyte MSW-MB = mswindows-multibyte-system-default " (setq config (or config (coding-system-current-system-configuration))) (let ((defs (cdr (assq var coding-system-variable-default-value-table)))) (or defs (error 'invalid-constant "Invalid coding system variable" var)) (let ((pos (position config coding-system-default-configuration-list))) (or pos (error 'invalid-constant "Invalid coding system configuration" config)) (nth pos defs)))) (defun reset-coding-system-defaults (&optional config) "Reset all basic coding system variables are set to their default values. See `coding-system-variable-default-value'." (setq config (or config (coding-system-current-system-configuration))) (mapcar #'(lambda (var) (set-coding-system-variable var (coding-system-variable-default-value var config))) coding-system-default-variable-list)) (defun reset-coding-categories-to-default () "Reset all coding categories (used for automatic detection) to their defaults. The order of priorities of coding categories and the coding system bound to each category are as follows: coding category coding system -------------------------------------------------- utf-16-little-endian-bom utf-16-little-endian utf-16-bom utf-16-bom iso-7 iso-2022-7bit no-conversion raw-text utf-8 utf-8 iso-8-1 iso-8859-1 iso-8-2 ctext (iso-8859-1 alias) iso-8-designate ctext (iso-8859-1 alias) iso-lock-shift iso-2022-lock shift-jis shift-jis big5 big5 utf-16-little-endian utf-16-little-endian utf-16 utf-16 ucs-4 ucs-4 " ;; #### What a mess! This needs to be overhauled. ;; The old table (from FSF synch?) was not what we use (cf mule-coding.el), ;; and as documented iso-8-designate is inconsistent with iso-2022-8bit-ss2. ;; The order of priorities of coding categories and the coding system ;; bound to each category are as follows: ;; ;; coding category coding system ;; -------------------------------------------------- ;; iso-8-2 iso-8859-1 ;; iso-8-1 iso-8859-1 ;; iso-7 iso-2022-7bit ;; iso-lock-shift iso-2022-lock ;; iso-8-designate iso-2022-8bit-ss2 ;; no-conversion raw-text ;; shift-jis shift_jis ;; big5 big5 ;; ucs-4 ---- ;; utf-8 ---- (when (featurep 'mule) (set-coding-category-system 'iso-7 'iso-2022-7) (set-coding-category-system 'iso-8-1 'iso-8859-1) (set-coding-category-system 'iso-8-2 'ctext) (set-coding-category-system 'iso-lock-shift 'iso-2022-lock) (set-coding-category-system 'iso-8-designate 'ctext) (if (find-coding-system 'shift-jis) (set-coding-category-system 'shift-jis 'shift-jis)) (if (find-coding-system 'big5) (set-coding-category-system 'big5 'big5)) ) (set-coding-category-system 'no-conversion (coding-system-variable-default-value 'no-conversion-coding-system-mapping)) (set-coding-category-system 'ucs-4 'ucs-4) (set-coding-category-system 'utf-8 'utf-8) (set-coding-category-system 'utf-16-little-endian 'utf-16-little-endian) (set-coding-category-system 'utf-16 'utf-16) (set-coding-category-system 'utf-16-little-endian-bom 'utf-16-little-endian-bom) (set-coding-category-system 'utf-16-bom 'utf-16-bom) (set-coding-priority-list (if (featurep 'mule) '(utf-16-little-endian-bom utf-16-bom iso-7 no-conversion utf-8 iso-8-1 iso-8-2 iso-8-designate iso-lock-shift shift-jis big5 utf-16-little-endian utf-16 ucs-4) '(utf-16-little-endian-bom utf-16-bom no-conversion utf-8 utf-16-little-endian utf-16 ucs-4)))) (defun reset-language-environment () "Reset coding system environment of XEmacs to the default status. All basic coding system variables are set to their default values, as are the coding categories used for automatic detection and their priority. BE VERY CERTAIN YOU WANT TO DO THIS BEFORE DOING IT! For more information, see `reset-coding-system-defaults' and `reset-coding-categories-to-default'." (reset-coding-system-defaults) (reset-coding-categories-to-default)) ;; Initialize everything so that the remaining Lisp files can contain ;; extended characters. (They will be in ISO-7 format) ;; !!####!! The Lisp files should all be in UTF-8!!! That way, all ;; special characters appear as high bits and there's no problem with ;; the Lisp parser trying to read a Mule file and getting all screwed ;; up. The only other thing then would be characters; we just need to ;; modify the Lisp parser to read the stuff directly after a ? as ;; UTF-8 and return a 30-bit value directly, and modify the character ;; routines a bit to allow such a beast to exist. MAKE IT A POINT TO ;; IMPLEMENT THIS AS ONE OF MY FUTURE PROJECTS. --ben (reset-language-environment) ;;; code-init.el ends here