Mercurial > hg > xemacs-beta
view lisp/code-init.el @ 4690:257b468bf2ca
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we need such
functionality if we're going to have a reliable and portable
#'query-coding-region implementation. However, this change doesn't yet
provide #'query-coding-region for the mswindow-multibyte coding systems,
there should be no functional differences between an XEmacs with this change
and one without it.
src/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we
need such functionality if we're going to have a reliable and
portable #'query-coding-region implementation. However, this
change doesn't yet provide #'query-coding-region for the
mswindow-multibyte coding systems, there should be no functional
differences between an XEmacs with this change and one without it.
* mule-coding.c (struct fixed_width_coding_system):
Add a new coding system type, fixed_width, and implement it. It
uses the CCL infrastructure but has a much simpler creation API,
and its own query_method, formerly in lisp/mule/mule-coding.el.
* unicode.c:
Move the Unicode query method implementation here from
unicode.el.
* lisp.h: Declare Fmake_coding_system_internal, Fcopy_range_table
here.
* intl-win32.c (complex_vars_of_intl_win32):
Use Fmake_coding_system_internal, not Fmake_coding_system.
* general-slots.h: Add Qsucceeded, Qunencodable, Qinvalid_sequence
here.
* file-coding.h (enum coding_system_variant):
Add fixed_width_coding_system here.
(struct coding_system_methods):
Add query_method and query_lstream_method to the coding system
methods.
Provide flags for the query methods.
Declare the default query method; initialise it correctly in
INITIALIZE_CODING_SYSTEM_TYPE.
* file-coding.c (default_query_method):
New function, the default query method for coding systems that do
not set it. Moved from coding.el.
(make_coding_system_1):
Accept new elements in PROPS in #'make-coding-system; aliases, a
list of aliases; safe-chars and safe-charsets (these were
previously accepted but not saved); and category.
(Fmake_coding_system_internal):
New function, what used to be #'make-coding-system--on Mule
builds, we've now moved some of the functionality of this to
Lisp.
(Fcoding_system_canonical_name_p):
Move this earlier in the file, since it's now called from within
make_coding_system_1.
(Fquery_coding_region):
Move the implementation of this here, from coding.el.
(complex_vars_of_file_coding):
Call Fmake_coding_system_internal, not Fmake_coding_system;
specify safe-charsets properties when we're a mule build.
* extents.h (mouse_highlight_priority, Fset_extent_priority,
Fset_extent_face, Fmap_extents):
Make these available to other C files.
lisp/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
* coding.el:
Consolidate code that depends on the presence or absence of Mule
at the end of this file.
(default-query-coding-region, query-coding-region):
Move these functions to C.
(default-query-coding-region-safe-charset-skip-chars-map):
Remove this variable, the corresponding C variable is
Vdefault_query_coding_region_chartab_cache in file-coding.c.
(query-coding-string): Update docstring to reflect actual multiple
values, be more careful about not modifying a range table that
we're currently mapping over.
(encode-coding-char): Make the implementation of this simpler.
(featurep 'mule): Autoload #'make-coding-system from
mule/make-coding-system.el if we're a mule build; provide an
appropriate compiler macro.
Do various non-mule compatibility things if we're not a mule
build.
* update-elc.el (additional-dump-dependencies):
Add mule/make-coding-system as a dump time dependency if we're a
mule build.
* unicode.el (ccl-encode-to-ucs-2):
(decode-char):
(encode-char):
Move these earlier in the file, for the sake of some byte compile
warnings.
(unicode-query-coding-region):
Move this to unicode.c
* mule/make-coding-system.el:
New file, not dumped. Contains the functionality to rework the
arguments necessary for fixed-width coding systems, and contains
the implementation of #'make-coding-system, which now calls
#'make-coding-system-internal.
* mule/vietnamese.el (viscii):
* mule/latin.el (iso-8859-2):
(windows-1250):
(iso-8859-3):
(iso-8859-4):
(iso-8859-14):
(iso-8859-15):
(iso-8859-16):
(iso-8859-9):
(macintosh):
(windows-1252):
* mule/hebrew.el (iso-8859-8):
* mule/greek.el (iso-8859-7):
(windows-1253):
* mule/cyrillic.el (iso-8859-5):
(koi8-r):
(koi8-u):
(windows-1251):
(alternativnyj):
(koi8-ru):
(koi8-t):
(koi8-c):
(koi8-o):
* mule/arabic.el (iso-8859-6):
(windows-1256):
Move all these coding systems to being of type fixed-width, not of
type CCL. This allows the distinct query-coding-region for them to
be in C, something which will eventually allow us to implement
query-coding-region for the mswindows-multibyte coding systems.
* mule/general-late.el (posix-charset-to-coding-system-hash):
Document why we're pre-emptively persuading the byte compiler that
the ELC for this file needs to be written using escape-quoted.
Call #'set-unicode-query-skip-chars-args, now the Unicode
query-coding-region implementation is in C.
* mule/thai-xtis.el (tis-620):
Don't bother checking whether we're XEmacs or not here.
* mule/mule-coding.el:
Move the eight bit fixed-width functionality from this file to
make-coding-system.el.
tests/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
* automated/mule-tests.el:
Check a coding system's type, not an 8-bit-fixed property, for
whether that coding system should be treated as a fixed-width
coding system.
* automated/query-coding-tests.el:
Don't test the query coding functionality for mswindows-multibyte
coding systems, it's not yet implemented.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 19 Sep 2009 22:53:13 +0100 |
| parents | 1d74a1d115ee |
| children | d2ec55325515 |
line wrap: on
line source
;;; code-init.el --- Handle coding system default values ;; Copyright (C) 2001, 2002, 2003 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. ;; #### Issues (this discussion probably belongs elsewhere) ;; 1. "Big" characters are unrepresentable. Should give error, warning, ;; not just substitute "~". ;; 2. 21.4 compatibility? ;; 3. make-char: non-mule barfs on non-iso8859-1. ;;; 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 (eval 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))) ;; NOTE NOTE NOTE: These values may get overridden when the language ;; environment is initialized (set-language-environment-coding-systems). (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 ;; #### iso-2022-8 with no eol specified? can that be OK? binary binary iso-2022-8 raw-text-dos mswindows-multibyte-dos) (native binary binary binary raw-text-dos mswindows-multibyte-system-default-dos) (keyboard binary raw-text undecided-unix raw-text undecided-unix) ;; 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 native keyboard terminal default-process-coding-system-read default-process-coding-system-write no-conversion-coding-system-mapping)) (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)) (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)) (no-conversion-coding-system-mapping (coding-category-system 'no-conversion)) (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)) (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))) (no-conversion-coding-system-mapping (set-coding-category-system 'no-conversion 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 native binary binary binary raw-text-dos MSW-MB-SD-dos keyboard binary raw-text undecided-unix raw-text undecided-unix 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. `native' (native) The coding system named `native'. Changed using `define-coding-system-alias'. Used internally when passing 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 utf-8-bom utf-8-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-8-bom 'utf-8-bom) (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 utf-8-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 utf-8-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) (coding-system-put 'raw-text 'safe-charsets '(ascii control-1 latin-iso8859-1)) ;;; code-init.el ends here
