Mercurial > hg > xemacs-beta
view src/general-slots.h @ 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 | 6b2ef948e140 |
children | 3ba90c659d01 |
line wrap: on
line source
/* Commonly-used symbols -- include file Copyright (C) 1995 Sun Microsystems. Copyright (C) 1995, 1996, 2000, 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. */ /* Synched up with: Not in FSF. */ /* The purpose of this file is as a central place to stick symbols that don't have any obvious connection to any particular module and might be used in many different contexts. Four types of declarations are allowed here: SYMBOL (Qfoo); declares a symbol "foo" SYMBOL_MODULE_API (Qfoo); declares a symbol "foo" that is visible to modules SYMBOL_KEYWORD (Q_foo); declares a keyword symbol ":foo" SYMBOL_GENERAL (Qfoo, "bar"); declares a symbol named "bar" but stored in the variable Qfoo To sort the crap in this file, use the following: (sort-regexp-fields nil "^.*(Q_?\\(.*\\));$" "\\1" (progn (search-forward "SYMBOL") (match-beginning 0)) (point-max)) */ SYMBOL (Qabort); SYMBOL_KEYWORD (Q_accelerator); SYMBOL_KEYWORD (Q_active); SYMBOL (Qactually_requested); SYMBOL (Qafter); SYMBOL (Qall); SYMBOL (Qand); SYMBOL (Qappend); SYMBOL (Qascii); SYMBOL (Qassoc); SYMBOL (Qat); SYMBOL (Qautodetect); SYMBOL (Qbad_variable); SYMBOL (Qbefore); SYMBOL (Qbigfloat); SYMBOL (Qbinary); SYMBOL (Qbitmap); SYMBOL (Qboolean); SYMBOL_KEYWORD (Q_border); SYMBOL (Qbottom); SYMBOL (Qbottom_margin); SYMBOL (Qbuffer); SYMBOL (Qbuffers); SYMBOL (Qbuilt_in); SYMBOL (Qbutton); SYMBOL_KEYWORD (Q_buttons); SYMBOL_KEYWORD (Q_callback); SYMBOL_KEYWORD (Q_callback_ex); SYMBOL (Qcancel); SYMBOL (Qcategory); SYMBOL (Qccl_program); SYMBOL (Qcenter); SYMBOL (Qchain); SYMBOL (Qchange); SYMBOL (Qchannel); SYMBOL (Qchar); SYMBOL (Qcharacter); SYMBOL (Qchars); SYMBOL (Qcode_page); SYMBOL (Qcoding_system); SYMBOL (Qcolor); SYMBOL (Qcolumns); SYMBOL (Qcommand); SYMBOL_KEYWORD (Q_config); SYMBOL (Qconsole); SYMBOL (Qcontrol_1); SYMBOL (Qcopies); SYMBOL_MODULE_API (Qcritical); SYMBOL (Qctext); SYMBOL (Qcurrent); SYMBOL (Qcursor); SYMBOL (Qdata); SYMBOL (Qdde); SYMBOL (Qdead); SYMBOL (Qdebug); SYMBOL (Qdefault); SYMBOL_MODULE_API (Qdelete); SYMBOL (Qdelq); SYMBOL (Qdescription); SYMBOL_KEYWORD (Q_descriptor); SYMBOL (Qdevice); SYMBOL (Qdevices); SYMBOL_KEYWORD (Q_device); SYMBOL (Qdialog); SYMBOL (Qdirectory); SYMBOL (Qdimension); SYMBOL (Qdisplay); SYMBOL (Qdoc_string); SYMBOL (Qdocumentation); SYMBOL (Qduplex); SYMBOL (Qdynarr_overhead); SYMBOL (Qemergency); SYMBOL (Qempty); SYMBOL (Qencode_as_utf_8); SYMBOL (Qeq); SYMBOL (Qeql); SYMBOL (Qequal); SYMBOL (Qeval); SYMBOL (Qevent); SYMBOL (Qextents); SYMBOL (Qexternal); SYMBOL (Qface); SYMBOL (Qfaces); SYMBOL (Qfallback); SYMBOL (Qfile); SYMBOL_MODULE_API (Qfile_name); SYMBOL_KEYWORD (Q_filter); SYMBOL (Qfinal); SYMBOL (Qfixnum); SYMBOL (Qfloat); SYMBOL (Qfont); SYMBOL (Qframe); SYMBOL (Qframes); SYMBOL (Qfrom_page); SYMBOL (Qfull_assoc); SYMBOL (Qfuncall); SYMBOL (Qfunction); SYMBOL (Qgap_overhead); SYMBOL (Qgarbage_collection); SYMBOL (Qgeneric); SYMBOL (Qgeometry); SYMBOL (Qglobal); SYMBOL (Qglyph); SYMBOL (Qgtk); SYMBOL (Qgui_item); SYMBOL (Qgutter); SYMBOL (Qheight); SYMBOL_KEYWORD (Q_height); SYMBOL (Qhelp); SYMBOL (Qhigh); SYMBOL (Qhighlight); SYMBOL (Qhorizontal); SYMBOL (Qicon); SYMBOL (Qid); SYMBOL (Qignore); SYMBOL (Qinitial); SYMBOL (Qimage); SYMBOL_KEYWORD (Q_image); SYMBOL_KEYWORD (Q_included); SYMBOL (Qinfo); SYMBOL (Qinherit); SYMBOL_KEYWORD (Q_initial_focus); SYMBOL (Qinteger); SYMBOL (Qinternal); SYMBOL_KEYWORD (Q_items); SYMBOL_KEYWORD (Q_justify); SYMBOL_KEYWORD (Q_vertically_justify); SYMBOL_KEYWORD (Q_horizontally_justify); SYMBOL (Qkey); SYMBOL (Qkey_assoc); SYMBOL (Qkey_mapping); SYMBOL_KEYWORD (Q_key_sequence); SYMBOL (Qkeyboard); SYMBOL (Qkeymap); SYMBOL_KEYWORD (Q_keys); SYMBOL_KEYWORD (Q_label); SYMBOL (Qlandscape); SYMBOL (Qlast_command); SYMBOL (Qleft); SYMBOL (Qleft_margin); SYMBOL (Qlet); SYMBOL (Qlevel); SYMBOL (Qlist); SYMBOL (Qlittle_endian); SYMBOL (Qlocale); SYMBOL (Qlow); SYMBOL (Qmagic); SYMBOL (Qmalloc_overhead); SYMBOL_KEYWORD (Q_margin_width); SYMBOL (Qmarkers); SYMBOL (Qmax); SYMBOL (Qmemory); SYMBOL (Qmenubar); SYMBOL (Qmessage); SYMBOL_GENERAL (Qminus, "-"); SYMBOL (Qmodifiers); SYMBOL (Qmotion); SYMBOL (Qmsprinter); SYMBOL (Qmswindows); SYMBOL (Qname); SYMBOL_MODULE_API (Qnative); SYMBOL (Qnatnum); SYMBOL (Qno); SYMBOL (Qnone); SYMBOL (Qnot); SYMBOL (Qnothing); SYMBOL_MODULE_API (Qnotice); SYMBOL (Qobject); SYMBOL (Qok); SYMBOL (Qold_assoc); SYMBOL (Qold_delete); SYMBOL (Qold_delq); SYMBOL (Qold_rassoc); SYMBOL (Qold_rassq); SYMBOL (Qonly); SYMBOL (Qor); SYMBOL (Qorientation); SYMBOL_KEYWORD (Q_orientation); SYMBOL (Qother); SYMBOL (Qpage_setup); SYMBOL (Qpages); SYMBOL (Qpeer); SYMBOL (Qpointer); SYMBOL (Qpopup); SYMBOL (Qportrait); SYMBOL (Qprepend); SYMBOL (Qprint); SYMBOL (Qprinter); SYMBOL_KEYWORD (Q_printer_settings); SYMBOL (Qprocess); SYMBOL_KEYWORD (Q_properties); SYMBOL (Qprovide); SYMBOL (Qquery_coding_clear_highlights); SYMBOL (Qquery_coding_warning_face); SYMBOL (Qquestion); SYMBOL_KEYWORD (Q_question); SYMBOL (Qradio); SYMBOL (Qrassoc); SYMBOL (Qrassq); SYMBOL (Qratio); SYMBOL (Qredisplay); SYMBOL (Qremove_all); SYMBOL (Qrequire); SYMBOL (Qresource); SYMBOL (Qretry); SYMBOL (Qreturn); SYMBOL (Qreverse); SYMBOL (Qright); SYMBOL (Qright_margin); SYMBOL_MODULE_API (Qsearch); SYMBOL (Qselected); SYMBOL_KEYWORD (Q_selected); SYMBOL (Qselection); SYMBOL (Qset_glyph_image); SYMBOL (Qsignal); SYMBOL_MODULE_API (Qsimple); SYMBOL (Qsize); SYMBOL (Qsound); SYMBOL (Qspace); SYMBOL (Qspecifier); SYMBOL (Qstandard); SYMBOL (Qstream); SYMBOL (Qstring); SYMBOL_KEYWORD (Q_style); SYMBOL_KEYWORD (Q_suffix); SYMBOL (Qsubtype); SYMBOL (Qsucceeded); SYMBOL (Qsymbol); SYMBOL (Qsyntax); SYMBOL (Qsystem_default); SYMBOL (Qterminal); SYMBOL (Qtest); SYMBOL (Qtext); SYMBOL_KEYWORD (Q_text); SYMBOL (Qthis_command); SYMBOL (Qtimeout); SYMBOL (Qtimestamp); SYMBOL_KEYWORD (Q_title); SYMBOL (Qto_page); SYMBOL (Qtoggle); SYMBOL (Qtoolbar); SYMBOL (Qtop); SYMBOL (Qtop_margin); SYMBOL (Qtty); SYMBOL (Qtype); SYMBOL (Qundecided); SYMBOL (Qundefined); SYMBOL (Qunencodable); SYMBOL (Qinvalid_sequence); SYMBOL (Qunimplemented); SYMBOL (Qunicode_registries); SYMBOL (Qunicode_type); SYMBOL (Quser_default); SYMBOL_KEYWORD (Q_value); SYMBOL (Qvalue_assoc); SYMBOL (Qvertical); SYMBOL (Qwarning); SYMBOL (Qwidget); SYMBOL (Qwidth); SYMBOL_KEYWORD (Q_width); SYMBOL (Qwindow); SYMBOL (Qwindows); SYMBOL (Qwindow_id); SYMBOL (Qwindow_system); SYMBOL (Qx); SYMBOL (Qy); SYMBOL (Qyes);