Mercurial > hg > xemacs-beta
annotate netinstall/resource.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 | 943eaba38521 |
children |
rev | line source |
---|---|
771 | 1 //{{NO_DEPENDENCIES}} |
2 // Microsoft Developer Studio generated include file. | |
3 // Used by res.rc | |
4 // | |
5 #define IDS_ROOT_SLASH 1 | |
6 #define IDS_ROOT_SPACE 2 | |
7 #define IDS_CWD_NONEMPTY 3 | |
8 #define IDS_MIRROR_LST 6 | |
9 #define IDS_DIALOG_FAILED 7 | |
10 #define IDS_CYGWIN_FUNC_MISSING 8 | |
11 #define IDS_DOWNLOAD_SHORT 9 | |
12 #define IDS_ERR_OPEN_WRITE 10 | |
13 #define IDS_SETUPINI_MISSING 11 | |
14 #define IDS_OLD_SETUPINI 12 | |
15 #define IDS_ERR_RENAME 13 | |
16 #define IDS_NOTHING_INSTALLED 14 | |
17 #define IDS_INSTALL_COMPLETE 15 | |
18 #define IDS_ERR_OPEN_READ 16 | |
19 #define IDS_ROOT_ABSOLUTE 17 | |
20 #define IDS_DOWNLOAD_COMPLETE 18 | |
21 #define IDS_CVSID 19 | |
22 #define IDS_NOLOGFILE 20 | |
23 #define IDS_UNINSTALL_COMPLETE 21 | |
24 #define IDS_WININET 22 | |
25 #define IDS_ERR_CHDIR 23 | |
26 #define IDS_OLD_SETUP_VERSION 24 | |
27 #define IDS_DOWNLOAD_FAILED 25 | |
28 #define IDS_DOWNLOAD_INCOMPLETE 26 | |
29 #define IDS_INSTALL_INCOMPLETE 27 | |
30 #define IDS_ROOT_NOCYGWIN 28 | |
31 #define IDS_CREATE_DIR 29 | |
32 #define IDD_ROOT 101 | |
33 #define IDD_SOURCE 102 | |
34 #define IDD_OTHER_URL 103 | |
35 #define IDD_SITE 104 | |
36 #define IDD_NET 105 | |
37 #define IDD_DLSTATUS 106 | |
38 #define IDD_S_LOAD_INI 107 | |
39 #define IDD_S_FROM_CWD 108 | |
40 #define IDD_CHOOSE 109 | |
41 #define IDD_S_DOWNLOAD 110 | |
42 #define IDD_S_INSTALL 111 | |
43 #define IDD_INSTATUS 112 | |
44 #define IDD_DESKTOP 113 | |
45 #define IDD_PROXY_AUTH 114 | |
46 #define IDD_S_POSTINSTALL 115 | |
47 #define IDD_NET_AUTH 116 | |
48 #define IDD_SPLASH 117 | |
49 #define IDB_SPIN 118 | |
50 #define IDB_RTARROW 119 | |
51 #define IDI_SPIN 120 | |
52 #define IDI_XEMACS 121 | |
53 #define IDD_LOCAL_DIR 122 | |
54 #define IDB_CHECK_YES 123 | |
55 #define IDB_CHECK_NO 124 | |
56 #define IDB_CHECK_NA 125 | |
57 #define IDB_GNU 126 | |
58 #define IDD_UNINSTALL 127 | |
59 #define IDC_SOURCE_DOWNLOAD 1000 | |
60 #define IDC_SOURCE_NETINST 1001 | |
61 #define IDC_SOURCE_CWD 1002 | |
62 #define IDC_ROOT_DIR 1003 | |
63 #define IDC_ROOT_BROWSE 1004 | |
64 #define IDC_ROOT_TEXT 1005 | |
65 #define IDC_ROOT_BINARY 1006 | |
66 #define IDC_URL_LIST 1007 | |
67 #define IDC_SITE_NEXT 1008 | |
68 #define IDC_BACK 1009 | |
69 #define IDC_OTHER_URL 1010 | |
70 #define IDC_NET_IE5 1011 | |
71 #define IDC_NET_DIRECT 1012 | |
72 #define IDC_NET_PROXY 1013 | |
73 #define IDC_PROXY_HOST 1014 | |
74 #define IDC_PROXY_PORT 1015 | |
75 #define IDC_PROXY_USER 1016 | |
76 #define IDC_DLS_PROGRESS 1019 | |
77 #define IDC_DLS_URL 1020 | |
78 #define IDC_DLS_RATE 1021 | |
79 #define IDC_INS_PKG 1022 | |
80 #define IDC_INS_FILE 1023 | |
81 #define IDC_INS_DISKFULL 1024 | |
82 #define IDC_INS_IPROGRESS 1025 | |
83 #define IDC_INS_PPROGRESS 1026 | |
84 #define IDC_ROOT_SYSTEM 1028 | |
85 #define IDC_ROOT_USER 1029 | |
86 #define IDC_NET_USER 1030 | |
87 #define IDC_NET_PASSWD 1031 | |
88 #define IDC_VERSION 1033 | |
89 #define IDC_LISTVIEW_POS 1034 | |
90 #define IDC_CHOOSE_FULLPART 1035 | |
91 #define IDC_CHOOSE_EXP 1036 | |
92 #define IDC_CHOOSE_CURR 1037 | |
93 #define IDC_CHOOSE_PREV 1038 | |
94 #define IDC_CHOOSE_LIST 1039 | |
95 #define IDC_INS_ACTION 1040 | |
96 #define IDC_ROOT_DESKTOP 1041 | |
97 #define IDC_ROOT_MENU 1042 | |
98 #define IDC_LOCAL_DIR_BROWSE 1043 | |
99 #define IDC_TXT_TYPE 1043 | |
100 #define IDC_LOCAL_DIR 1044 | |
101 #define IDC_JAVA_TYPE 1044 | |
102 #define IDC_INSTALL_NATIVE 1045 | |
103 #define IDC_C_TYPE 1045 | |
104 #define IDC_INSTALL_CYGWIN 1046 | |
105 #define IDC_CPP_TYPE 1046 | |
106 #define IDC_UNINS_PKG 1047 | |
107 #define IDC_ELISP_TYPE 1047 | |
108 #define IDC_UNINS_FILE 1048 | |
109 #define IDC_IDL_TYPE 1048 | |
110 #define IDC_UNINS_DISKFULL 1049 | |
111 #define IDC_UNINS_IPROGRESS 1050 | |
112 #define IDC_UNINS_PPROGRESS 1051 | |
113 #define IDC_UNINS_ACTION 1052 | |
114 #define IDC_STATIC -1 | |
115 | |
116 // Next default values for new objects | |
117 // | |
118 #ifdef APSTUDIO_INVOKED | |
119 #ifndef APSTUDIO_READONLY_SYMBOLS | |
120 #define _APS_NO_MFC 1 | |
121 #define _APS_3D_CONTROLS 1 | |
122 #define _APS_NEXT_RESOURCE_VALUE 127 | |
123 #define _APS_NEXT_COMMAND_VALUE 40003 | |
124 #define _APS_NEXT_CONTROL_VALUE 1050 | |
125 #define _APS_NEXT_SYMED_VALUE 101 | |
126 #endif | |
127 #endif |