Mercurial > emacs
annotate src/category.c @ 25935:d257e2f126f2
.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 08 Oct 1999 21:44:24 +0000 |
parents | 265202db376b |
children | dfead1ef574c |
rev | line source |
---|---|
17052 | 1 /* GNU Emacs routines to deal with category tables. |
18341
33e78cc7f058
Change copyright notices.
Richard M. Stallman <rms@gnu.org>
parents:
17787
diff
changeset
|
2 Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN. |
33e78cc7f058
Change copyright notices.
Richard M. Stallman <rms@gnu.org>
parents:
17787
diff
changeset
|
3 Licensed to the Free Software Foundation. |
17052 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
7 GNU Emacs is free software; you can redistribute it and/or modify | |
8 it under the terms of the GNU General Public License as published by | |
9 the Free Software Foundation; either version 2, or (at your option) | |
10 any later version. | |
11 | |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with GNU Emacs; see the file COPYING. If not, write to | |
17071 | 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
20 Boston, MA 02111-1307, USA. */ | |
17052 | 21 |
22 | |
23 /* Here we handle three objects: category, category set, and category | |
24 table. Read comments in the file category.h to understand them. */ | |
25 | |
26 #include <config.h> | |
27 #include <ctype.h> | |
28 #include "lisp.h" | |
29 #include "buffer.h" | |
30 #include "charset.h" | |
31 #include "category.h" | |
32 | |
33 /* The version number of the latest category table. Each category | |
34 table has a unique version number. It is assigned a new number | |
35 also when it is modified. When a regular expression is compiled | |
36 into the struct re_pattern_buffer, the version number of the | |
37 category table (of the current buffer) at that moment is also | |
38 embedded in the structure. | |
39 | |
40 For the moment, we are not using this feature. */ | |
41 static int category_table_version; | |
42 | |
43 Lisp_Object Qcategory_table, Qcategoryp, Qcategorysetp, Qcategory_table_p; | |
44 | |
45 /* Variables to determine word boundary. */ | |
46 Lisp_Object Vword_combining_categories, Vword_separating_categories; | |
47 | |
48 /* Temporary internal variable used in macro CHAR_HAS_CATEGORY. */ | |
49 Lisp_Object _temp_category_set; | |
50 | |
51 | |
52 /* Category set staff. */ | |
53 | |
54 DEFUN ("make-category-set", Fmake_category_set, Smake_category_set, 1, 1, 0, | |
55 "Return a newly created category-set which contains CATEGORIES.\n\ | |
20825
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
56 CATEGORIES is a string of category mnemonics.\n\ |
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
57 The value is a bool-vector which has t at the indices corresponding to\n\ |
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
58 those categories.") |
17052 | 59 (categories) |
60 Lisp_Object categories; | |
61 { | |
62 Lisp_Object val; | |
63 int len; | |
64 | |
65 CHECK_STRING (categories, 0); | |
66 val = MAKE_CATEGORY_SET; | |
67 | |
20612
5a0922f8c841
(Fmake_category_set): Don't allow multibyte string.
Richard M. Stallman <rms@gnu.org>
parents:
20189
diff
changeset
|
68 if (STRING_MULTIBYTE (categories)) |
5a0922f8c841
(Fmake_category_set): Don't allow multibyte string.
Richard M. Stallman <rms@gnu.org>
parents:
20189
diff
changeset
|
69 error ("Multibyte string in make-category-set"); |
5a0922f8c841
(Fmake_category_set): Don't allow multibyte string.
Richard M. Stallman <rms@gnu.org>
parents:
20189
diff
changeset
|
70 |
17052 | 71 len = XSTRING (categories)->size; |
72 while (--len >= 0) | |
73 { | |
17369
566b26e1930e
(Fmake_category_set): Use XSETFASTINT.
Karl Heuer <kwzh@gnu.org>
parents:
17324
diff
changeset
|
74 Lisp_Object category; |
17052 | 75 |
17369
566b26e1930e
(Fmake_category_set): Use XSETFASTINT.
Karl Heuer <kwzh@gnu.org>
parents:
17324
diff
changeset
|
76 XSETFASTINT (category, XSTRING (categories)->data[len]); |
17052 | 77 CHECK_CATEGORY (category, 0); |
78 SET_CATEGORY_SET (val, category, Qt); | |
79 } | |
80 return val; | |
81 } | |
82 | |
83 | |
84 /* Category staff. */ | |
85 | |
86 Lisp_Object check_category_table (); | |
87 | |
88 DEFUN ("define-category", Fdefine_category, Sdefine_category, 2, 3, 0, | |
89 "Define CHAR as a category which is described by DOCSTRING.\n\ | |
20825
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
90 CHAR should be an ASCII printing character in the range ` ' to `~'.\n\ |
17052 | 91 DOCSTRING is a documentation string of the category.\n\ |
92 The category is defined only in category table TABLE, which defaults to\n\ | |
93 the current buffer's category table.") | |
94 (category, docstring, table) | |
95 Lisp_Object category, docstring, table; | |
96 { | |
97 CHECK_CATEGORY (category, 0); | |
98 CHECK_STRING (docstring, 1); | |
99 table = check_category_table (table); | |
100 | |
101 if (!NILP (CATEGORY_DOCSTRING (table, XFASTINT (category)))) | |
102 error ("Category `%c' is already defined", XFASTINT (category)); | |
103 CATEGORY_DOCSTRING (table, XFASTINT (category)) = docstring; | |
104 | |
105 return Qnil; | |
106 } | |
107 | |
108 DEFUN ("category-docstring", Fcategory_docstring, Scategory_docstring, 1, 2, 0, | |
20825
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
109 "Return the documentation string of CATEGORY, as defined in CATEGORY-TABLE.") |
17052 | 110 (category, table) |
111 Lisp_Object category, table; | |
112 { | |
113 Lisp_Object doc; | |
114 | |
115 CHECK_CATEGORY (category, 0); | |
116 table = check_category_table (table); | |
117 | |
118 return CATEGORY_DOCSTRING (table, XFASTINT (category)); | |
119 } | |
120 | |
121 DEFUN ("get-unused-category", Fget_unused_category, Sget_unused_category, | |
122 0, 1, 0, | |
20825
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
123 "Return a category which is not yet defined in CATEGORY-TABLE.\n\ |
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
124 If no category remains available, return nil.\n\ |
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
125 The optional argument CATEGORY-TABLE specifies which category table\n\ |
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
126 to modify; it defaults to the current buffer's category table.") |
17052 | 127 (table) |
128 Lisp_Object table; | |
129 { | |
130 int i; | |
131 Lisp_Object docstring_vector; | |
132 | |
133 table = check_category_table (table); | |
134 | |
135 for (i = ' '; i <= '~'; i++) | |
136 if (NILP (CATEGORY_DOCSTRING (table, i))) | |
137 return make_number (i); | |
138 | |
139 return Qnil; | |
140 } | |
141 | |
142 | |
143 /* Category-table staff. */ | |
144 | |
145 DEFUN ("category-table-p", Fcategory_table_p, Scategory_table_p, 1, 1, 0, | |
146 "Return t if ARG is a category table.") | |
147 (arg) | |
148 Lisp_Object arg; | |
149 { | |
150 if (CHAR_TABLE_P (arg) | |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
151 && EQ (XCHAR_TABLE (arg)->purpose, Qcategory_table)) |
17052 | 152 return Qt; |
153 return Qnil; | |
154 } | |
155 | |
156 /* If TABLE is nil, return the current category table. If TABLE is | |
157 not nil, check the validity of TABLE as a category table. If | |
158 valid, return TABLE itself, but if not valid, signal an error of | |
159 wrong-type-argument. */ | |
160 | |
161 Lisp_Object | |
162 check_category_table (table) | |
163 Lisp_Object table; | |
164 { | |
165 register Lisp_Object tem; | |
166 if (NILP (table)) | |
167 return current_buffer->category_table; | |
168 while (tem = Fcategory_table_p (table), NILP (tem)) | |
169 table = wrong_type_argument (Qcategory_table_p, table); | |
170 return table; | |
171 } | |
172 | |
173 DEFUN ("category-table", Fcategory_table, Scategory_table, 0, 0, 0, | |
174 "Return the current category table.\n\ | |
175 This is the one specified by the current buffer.") | |
176 () | |
177 { | |
178 return current_buffer->category_table; | |
179 } | |
180 | |
181 DEFUN ("standard-category-table", Fstandard_category_table, | |
182 Sstandard_category_table, 0, 0, 0, | |
183 "Return the standard category table.\n\ | |
184 This is the one used for new buffers.") | |
185 () | |
186 { | |
187 return Vstandard_category_table; | |
188 } | |
189 | |
190 /* Return a copy of category table TABLE. We can't simply use the | |
191 function copy-sequence because no contents should be shared between | |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
192 the original and the copy. This function is called recursively by |
20189
16f5b56c2f68
(copy_category_table): Copy also the first extra slot
Kenichi Handa <handa@m17n.org>
parents:
19659
diff
changeset
|
193 binding TABLE to a sub char table. */ |
17052 | 194 |
195 Lisp_Object | |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
196 copy_category_table (table) |
17052 | 197 Lisp_Object table; |
198 { | |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
199 Lisp_Object tmp; |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
200 int i, to; |
17052 | 201 |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
202 if (!NILP (XCHAR_TABLE (table)->top)) |
17052 | 203 { |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
204 /* TABLE is a top level char table. |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
205 At first, make a copy of tree structure of the table. */ |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
206 table = Fcopy_sequence (table); |
17052 | 207 |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
208 /* Then, copy elements for single byte characters one by one. */ |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
209 for (i = 0; i < CHAR_TABLE_SINGLE_BYTE_SLOTS; i++) |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
210 if (!NILP (tmp = XCHAR_TABLE (table)->contents[i])) |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
211 XCHAR_TABLE (table)->contents[i] = Fcopy_sequence (tmp); |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
212 to = CHAR_TABLE_ORDINARY_SLOTS; |
20189
16f5b56c2f68
(copy_category_table): Copy also the first extra slot
Kenichi Handa <handa@m17n.org>
parents:
19659
diff
changeset
|
213 |
16f5b56c2f68
(copy_category_table): Copy also the first extra slot
Kenichi Handa <handa@m17n.org>
parents:
19659
diff
changeset
|
214 /* Also copy the first (and sole) extra slot. It is a vector |
16f5b56c2f68
(copy_category_table): Copy also the first extra slot
Kenichi Handa <handa@m17n.org>
parents:
19659
diff
changeset
|
215 containing docstring of each category. */ |
16f5b56c2f68
(copy_category_table): Copy also the first extra slot
Kenichi Handa <handa@m17n.org>
parents:
19659
diff
changeset
|
216 Fset_char_table_extra_slot |
16f5b56c2f68
(copy_category_table): Copy also the first extra slot
Kenichi Handa <handa@m17n.org>
parents:
19659
diff
changeset
|
217 (table, make_number (0), |
16f5b56c2f68
(copy_category_table): Copy also the first extra slot
Kenichi Handa <handa@m17n.org>
parents:
19659
diff
changeset
|
218 Fcopy_sequence (Fchar_table_extra_slot (table, make_number (0)))); |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
219 } |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
220 else |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
221 { |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
222 i = 32; |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
223 to = SUB_CHAR_TABLE_ORDINARY_SLOTS; |
17052 | 224 } |
225 | |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
226 /* If the table has non-nil default value, copy it. */ |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
227 if (!NILP (tmp = XCHAR_TABLE (table)->defalt)) |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
228 XCHAR_TABLE (table)->defalt = Fcopy_sequence (tmp); |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
229 |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
230 /* At last, copy the remaining elements while paying attention to a |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
231 sub char table. */ |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
232 for (; i < to; i++) |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
233 if (!NILP (tmp = XCHAR_TABLE (table)->contents[i])) |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
234 XCHAR_TABLE (table)->contents[i] |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
235 = (SUB_CHAR_TABLE_P (tmp) |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
236 ? copy_category_table (tmp) : Fcopy_sequence (tmp)); |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
237 |
17052 | 238 return table; |
239 } | |
240 | |
241 DEFUN ("copy-category-table", Fcopy_category_table, Scopy_category_table, | |
242 0, 1, 0, | |
243 "Construct a new category table and return it.\n\ | |
244 It is a copy of the TABLE, which defaults to the standard category table.") | |
245 (table) | |
246 Lisp_Object table; | |
247 { | |
248 if (!NILP (table)) | |
249 check_category_table (table); | |
250 else | |
251 table = Vstandard_category_table; | |
252 | |
20189
16f5b56c2f68
(copy_category_table): Copy also the first extra slot
Kenichi Handa <handa@m17n.org>
parents:
19659
diff
changeset
|
253 return copy_category_table (table); |
17052 | 254 } |
255 | |
256 DEFUN ("set-category-table", Fset_category_table, Sset_category_table, 1, 1, 0, | |
20825
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
257 "Specify TABLE as the category table for the current buffer.") |
17052 | 258 (table) |
259 Lisp_Object table; | |
260 { | |
261 table = check_category_table (table); | |
262 current_buffer->category_table = table; | |
263 /* Indicate that this buffer now has a specified category table. */ | |
264 current_buffer->local_var_flags | |
265 |= XFASTINT (buffer_local_flags.category_table); | |
266 return table; | |
267 } | |
268 | |
269 | |
270 DEFUN ("char-category-set", Fchar_category_set, Schar_category_set, 1, 1, 0, | |
20825
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
271 "Return the category set of CHAR.") |
17052 | 272 (ch) |
273 Lisp_Object ch; | |
274 { | |
275 Lisp_Object val; | |
276 int charset; | |
277 unsigned char c1, c2; | |
278 | |
279 CHECK_NUMBER (ch, 0); | |
280 return CATEGORY_SET (XFASTINT (ch)); | |
281 } | |
282 | |
283 DEFUN ("category-set-mnemonics", Fcategory_set_mnemonics, | |
284 Scategory_set_mnemonics, 1, 1, 0, | |
20825
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
285 "Return a string containing mnemonics of the categories in CATEGORY-SET.\n\ |
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
286 CATEGORY-SET is a bool-vector, and the categories \"in\" it are those\n\ |
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
287 that are indexes where t occurs the bool-vector.\n\ |
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
288 The return value is a string containing those same categories.") |
17052 | 289 (category_set) |
290 Lisp_Object category_set; | |
291 { | |
292 int i, j; | |
293 char str[96]; | |
294 | |
295 CHECK_CATEGORY_SET (category_set, 0); | |
296 | |
297 j = 0; | |
298 for (i = 32; i < 127; i++) | |
299 if (CATEGORY_MEMBER (i, category_set)) | |
300 str[j++] = i; | |
301 str[j] = '\0'; | |
302 | |
303 return build_string (str); | |
304 } | |
305 | |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
306 /* Modify all category sets stored under sub char-table TABLE so that |
17052 | 307 they contain (SET_VALUE is t) or don't contain (SET_VALUE is nil) |
308 CATEGORY. */ | |
309 | |
310 void | |
311 modify_lower_category_set (table, category, set_value) | |
312 Lisp_Object table, category, set_value; | |
313 { | |
314 Lisp_Object val; | |
315 int i; | |
316 | |
25835
265202db376b
(modify_lower_category_set): Set default value of
Kenichi Handa <handa@m17n.org>
parents:
25662
diff
changeset
|
317 val = XCHAR_TABLE (table)->defalt; |
265202db376b
(modify_lower_category_set): Set default value of
Kenichi Handa <handa@m17n.org>
parents:
25662
diff
changeset
|
318 if (!CATEGORY_SET_P (val)) |
265202db376b
(modify_lower_category_set): Set default value of
Kenichi Handa <handa@m17n.org>
parents:
25662
diff
changeset
|
319 val = MAKE_CATEGORY_SET; |
265202db376b
(modify_lower_category_set): Set default value of
Kenichi Handa <handa@m17n.org>
parents:
25662
diff
changeset
|
320 SET_CATEGORY_SET (val, category, set_value); |
265202db376b
(modify_lower_category_set): Set default value of
Kenichi Handa <handa@m17n.org>
parents:
25662
diff
changeset
|
321 XCHAR_TABLE (table)->defalt = val; |
17052 | 322 |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
323 for (i = 32; i < SUB_CHAR_TABLE_ORDINARY_SLOTS; i++) |
17052 | 324 { |
325 val = XCHAR_TABLE (table)->contents[i]; | |
326 | |
327 if (CATEGORY_SET_P (val)) | |
328 SET_CATEGORY_SET (val, category, set_value); | |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
329 else if (SUB_CHAR_TABLE_P (val)) |
17052 | 330 modify_lower_category_set (val, category, set_value); |
331 } | |
332 } | |
333 | |
334 void | |
335 set_category_set (category_set, category, val) | |
336 Lisp_Object category_set, category, val; | |
337 { | |
338 do { | |
339 int idx = XINT (category) / 8; | |
340 unsigned char bits = 1 << (XINT (category) % 8); | |
341 | |
342 if (NILP (val)) | |
343 XCATEGORY_SET (category_set)->data[idx] &= ~bits; | |
344 else | |
345 XCATEGORY_SET (category_set)->data[idx] |= bits; | |
346 } while (0); | |
347 } | |
348 | |
349 DEFUN ("modify-category-entry", Fmodify_category_entry, | |
350 Smodify_category_entry, 2, 4, 0, | |
20825
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
351 "Modify the category set of CHARACTER by adding CATEGORY to it.\n\ |
17052 | 352 The category is changed only for table TABLE, which defaults to\n\ |
353 the current buffer's category table.\n\ | |
20825
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
354 If optional fourth argument RESET is non-nil,\n\ |
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
355 then delete CATEGORY from the category set instead of adding it.") |
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
356 (character, category, table, reset) |
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
357 Lisp_Object character, category, table, reset; |
17052 | 358 { |
359 int c, charset, c1, c2; | |
360 Lisp_Object set_value; /* Actual value to be set in category sets. */ | |
361 Lisp_Object val, category_set; | |
362 | |
20825
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
363 CHECK_NUMBER (character, 0); |
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
364 c = XINT (character); |
17052 | 365 CHECK_CATEGORY (category, 1); |
366 table = check_category_table (table); | |
367 | |
368 if (NILP (CATEGORY_DOCSTRING (table, XFASTINT (category)))) | |
369 error ("Undefined category: %c", XFASTINT (category)); | |
370 | |
371 set_value = NILP (reset) ? Qt : Qnil; | |
372 | |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
373 if (c < CHAR_TABLE_SINGLE_BYTE_SLOTS) |
17052 | 374 { |
375 val = XCHAR_TABLE (table)->contents[c]; | |
376 if (!CATEGORY_SET_P (val)) | |
377 XCHAR_TABLE (table)->contents[c] = (val = MAKE_CATEGORY_SET); | |
378 SET_CATEGORY_SET (val, category, set_value); | |
379 return Qnil; | |
380 } | |
381 | |
382 SPLIT_NON_ASCII_CHAR (c, charset, c1, c2); | |
383 | |
384 /* The top level table. */ | |
17187
9ab0c08a3359
Adjusted for the change of CHAR_TABLE_ORDINARY_SLOTS.
Kenichi Handa <handa@m17n.org>
parents:
17071
diff
changeset
|
385 val = XCHAR_TABLE (table)->contents[charset + 128]; |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
386 if (CATEGORY_SET_P (val)) |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
387 category_set = val; |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
388 else if (!SUB_CHAR_TABLE_P (val)) |
17052 | 389 { |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
390 category_set = val = MAKE_CATEGORY_SET; |
17187
9ab0c08a3359
Adjusted for the change of CHAR_TABLE_ORDINARY_SLOTS.
Kenichi Handa <handa@m17n.org>
parents:
17071
diff
changeset
|
391 XCHAR_TABLE (table)->contents[charset + 128] = category_set; |
17052 | 392 } |
393 | |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
394 if (c1 <= 0) |
17052 | 395 { |
396 /* Only a charset is specified. */ | |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
397 if (SUB_CHAR_TABLE_P (val)) |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
398 /* All characters in CHARSET should be the same as for having |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
399 CATEGORY or not. */ |
17052 | 400 modify_lower_category_set (val, category, set_value); |
401 else | |
402 SET_CATEGORY_SET (category_set, category, set_value); | |
403 return Qnil; | |
404 } | |
405 | |
406 /* The second level table. */ | |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
407 if (!SUB_CHAR_TABLE_P (val)) |
17052 | 408 { |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
409 val = make_sub_char_table (Qnil); |
17187
9ab0c08a3359
Adjusted for the change of CHAR_TABLE_ORDINARY_SLOTS.
Kenichi Handa <handa@m17n.org>
parents:
17071
diff
changeset
|
410 XCHAR_TABLE (table)->contents[charset + 128] = val; |
17052 | 411 /* We must set default category set of CHARSET in `defalt' slot. */ |
412 XCHAR_TABLE (val)->defalt = category_set; | |
413 } | |
414 table = val; | |
415 | |
416 val = XCHAR_TABLE (table)->contents[c1]; | |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
417 if (CATEGORY_SET_P (val)) |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
418 category_set = val; |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
419 else if (!SUB_CHAR_TABLE_P (val)) |
17052 | 420 { |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
421 category_set = val = Fcopy_sequence (XCHAR_TABLE (table)->defalt); |
17052 | 422 XCHAR_TABLE (table)->contents[c1] = category_set; |
423 } | |
424 | |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
425 if (c2 <= 0) |
17052 | 426 { |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
427 if (SUB_CHAR_TABLE_P (val)) |
17052 | 428 /* All characters in C1 group of CHARSET should be the same as |
429 for CATEGORY. */ | |
430 modify_lower_category_set (val, category, set_value); | |
431 else | |
432 SET_CATEGORY_SET (category_set, category, set_value); | |
433 return Qnil; | |
434 } | |
435 | |
436 /* The third (bottom) level table. */ | |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
437 if (!SUB_CHAR_TABLE_P (val)) |
17052 | 438 { |
17459
22fc94ab9e79
(Fmodify_category_entry): Delete second arg in call to make_sub_char_table.
Karl Heuer <kwzh@gnu.org>
parents:
17369
diff
changeset
|
439 val = make_sub_char_table (Qnil); |
17052 | 440 XCHAR_TABLE (table)->contents[c1] = val; |
441 /* We must set default category set of CHARSET and C1 in | |
442 `defalt' slot. */ | |
443 XCHAR_TABLE (val)->defalt = category_set; | |
444 } | |
445 table = val; | |
446 | |
447 val = XCHAR_TABLE (table)->contents[c2]; | |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
448 if (CATEGORY_SET_P (val)) |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
449 category_set = val; |
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
450 else if (!SUB_CHAR_TABLE_P (val)) |
17052 | 451 { |
452 category_set = Fcopy_sequence (XCHAR_TABLE (table)->defalt); | |
453 XCHAR_TABLE (table)->contents[c2] = category_set; | |
454 } | |
455 else | |
456 /* This should never happen. */ | |
457 error ("Invalid category table"); | |
458 | |
459 SET_CATEGORY_SET (category_set, category, set_value); | |
460 | |
461 return Qnil; | |
462 } | |
463 | |
464 /* Dump category table to buffer in human-readable format */ | |
465 | |
466 static void | |
467 describe_category (value) | |
468 Lisp_Object value; | |
469 { | |
470 Lisp_Object mnemonics; | |
471 | |
472 Findent_to (make_number (16), make_number (1)); | |
473 | |
474 if (NILP (value)) | |
475 { | |
476 insert_string ("default\n"); | |
477 return; | |
478 } | |
479 | |
19659
315acc2627fe
(describe_category): Handle a sub-chartable.
Richard M. Stallman <rms@gnu.org>
parents:
18613
diff
changeset
|
480 if (CHAR_TABLE_P (value)) |
315acc2627fe
(describe_category): Handle a sub-chartable.
Richard M. Stallman <rms@gnu.org>
parents:
18613
diff
changeset
|
481 { |
315acc2627fe
(describe_category): Handle a sub-chartable.
Richard M. Stallman <rms@gnu.org>
parents:
18613
diff
changeset
|
482 insert_string ("deeper char-table ...\n"); |
315acc2627fe
(describe_category): Handle a sub-chartable.
Richard M. Stallman <rms@gnu.org>
parents:
18613
diff
changeset
|
483 return; |
315acc2627fe
(describe_category): Handle a sub-chartable.
Richard M. Stallman <rms@gnu.org>
parents:
18613
diff
changeset
|
484 } |
315acc2627fe
(describe_category): Handle a sub-chartable.
Richard M. Stallman <rms@gnu.org>
parents:
18613
diff
changeset
|
485 |
17052 | 486 if (!CATEGORY_SET_P (value)) |
487 { | |
488 insert_string ("invalid\n"); | |
489 return; | |
490 } | |
491 | |
492 mnemonics = Fcategory_set_mnemonics (value); | |
20612
5a0922f8c841
(Fmake_category_set): Don't allow multibyte string.
Richard M. Stallman <rms@gnu.org>
parents:
20189
diff
changeset
|
493 insert_from_string (mnemonics, 0, 0, XSTRING (mnemonics)->size, |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
20825
diff
changeset
|
494 STRING_BYTES (XSTRING (mnemonics)), 0); |
17052 | 495 insert_string ("\n"); |
496 return; | |
497 } | |
498 | |
499 static Lisp_Object | |
500 describe_category_1 (vector) | |
501 Lisp_Object vector; | |
502 { | |
503 struct buffer *old = current_buffer; | |
504 set_buffer_internal (XBUFFER (Vstandard_output)); | |
17787
eacf563a6d0d
(describe_category_1): Pass new args to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
17459
diff
changeset
|
505 describe_vector (vector, Qnil, describe_category, 0, Qnil, Qnil, |
eacf563a6d0d
(describe_category_1): Pass new args to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
17459
diff
changeset
|
506 (int *)0, 0); |
17052 | 507 { |
508 int i; | |
509 Lisp_Object docs = XCHAR_TABLE (vector)->extras[0]; | |
510 Lisp_Object elt; | |
511 | |
512 if (!VECTORP (docs) || XVECTOR (docs)->size != 95) | |
513 { | |
514 insert_string ("Invalid first extra slot in this char table\n"); | |
515 return Qnil; | |
516 } | |
517 | |
518 insert_string ("Meanings of mnemonice characters are:\n"); | |
519 for (i = 0; i < 95; i++) | |
520 { | |
521 elt = XVECTOR (docs)->contents[i]; | |
522 if (NILP (elt)) | |
523 continue; | |
524 | |
525 insert_char (i + 32); | |
526 insert (": ", 2); | |
20612
5a0922f8c841
(Fmake_category_set): Don't allow multibyte string.
Richard M. Stallman <rms@gnu.org>
parents:
20189
diff
changeset
|
527 insert_from_string (elt, 0, 0, XSTRING (elt)->size, |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
20825
diff
changeset
|
528 STRING_BYTES (XSTRING (elt)), 0); |
17052 | 529 insert ("\n", 1); |
530 } | |
531 } | |
532 | |
533 while (! NILP (XCHAR_TABLE (vector)->parent)) | |
534 { | |
535 vector = XCHAR_TABLE (vector)->parent; | |
536 insert_string ("\nThe parent category table is:"); | |
17787
eacf563a6d0d
(describe_category_1): Pass new args to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
17459
diff
changeset
|
537 describe_vector (vector, Qnil, describe_category, 0, Qnil, Qnil, |
eacf563a6d0d
(describe_category_1): Pass new args to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
17459
diff
changeset
|
538 (int *) 0, 0); |
17052 | 539 } |
540 | |
541 call0 (intern ("help-mode")); | |
542 set_buffer_internal (old); | |
543 return Qnil; | |
544 } | |
545 | |
20825
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
546 DEFUN ("describe-categories", Fdescribe_categories, Sdescribe_categories, 0, 0, "", |
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
547 "Describe the category specifications in the current category table.\n\ |
17052 | 548 The descriptions are inserted in a buffer, which is then displayed.") |
549 () | |
550 { | |
551 internal_with_output_to_temp_buffer | |
552 ("*Help*", describe_category_1, current_buffer->category_table); | |
553 | |
554 return Qnil; | |
555 } | |
556 | |
557 /* Return 1 if there is a word boundary between two word-constituent | |
558 characters C1 and C2 if they appear in this order, else return 0. | |
559 Use the macro WORD_BOUNDARY_P instead of calling this function | |
560 directly. */ | |
561 | |
562 int | |
563 word_boundary_p (c1, c2) | |
564 int c1, c2; | |
565 { | |
566 Lisp_Object category_set1, category_set2; | |
567 Lisp_Object tail; | |
568 int default_result; | |
569 | |
23755
63628f8fe648
(word_boundary_p): If C1 or C2 are composite
Kenichi Handa <handa@m17n.org>
parents:
23543
diff
changeset
|
570 if (COMPOSITE_CHAR_P (c1)) |
63628f8fe648
(word_boundary_p): If C1 or C2 are composite
Kenichi Handa <handa@m17n.org>
parents:
23543
diff
changeset
|
571 c1 = cmpchar_component (c1, 0, 1); |
63628f8fe648
(word_boundary_p): If C1 or C2 are composite
Kenichi Handa <handa@m17n.org>
parents:
23543
diff
changeset
|
572 if (COMPOSITE_CHAR_P (c2)) |
63628f8fe648
(word_boundary_p): If C1 or C2 are composite
Kenichi Handa <handa@m17n.org>
parents:
23543
diff
changeset
|
573 c2 = cmpchar_component (c2, 0, 1); |
63628f8fe648
(word_boundary_p): If C1 or C2 are composite
Kenichi Handa <handa@m17n.org>
parents:
23543
diff
changeset
|
574 |
17052 | 575 if (CHAR_CHARSET (c1) == CHAR_CHARSET (c2)) |
576 { | |
577 tail = Vword_separating_categories; | |
578 default_result = 0; | |
579 } | |
580 else | |
581 { | |
582 tail = Vword_combining_categories; | |
583 default_result = 1; | |
584 } | |
585 | |
586 category_set1 = CATEGORY_SET (c1); | |
587 if (NILP (category_set1)) | |
588 return default_result; | |
589 category_set2 = CATEGORY_SET (c2); | |
590 if (NILP (category_set2)) | |
591 return default_result; | |
592 | |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
23755
diff
changeset
|
593 for (; CONSP (tail); tail = XCDR (tail)) |
17052 | 594 { |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
23755
diff
changeset
|
595 Lisp_Object elt = XCAR (tail); |
17052 | 596 |
597 if (CONSP (elt) | |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
23755
diff
changeset
|
598 && CATEGORYP (XCAR (elt)) |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
23755
diff
changeset
|
599 && CATEGORYP (XCDR (elt)) |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
23755
diff
changeset
|
600 && CATEGORY_MEMBER (XFASTINT (XCAR (elt)), category_set1) |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
23755
diff
changeset
|
601 && CATEGORY_MEMBER (XFASTINT (XCDR (elt)), category_set2)) |
17052 | 602 return !default_result; |
603 } | |
604 return default_result; | |
605 } | |
606 | |
607 | |
21514 | 608 void |
17052 | 609 init_category_once () |
610 { | |
611 /* This has to be done here, before we call Fmake_char_table. */ | |
612 Qcategory_table = intern ("category-table"); | |
613 staticpro (&Qcategory_table); | |
614 | |
615 /* Intern this now in case it isn't already done. | |
616 Setting this variable twice is harmless. | |
617 But don't staticpro it here--that is done in alloc.c. */ | |
618 Qchar_table_extra_slots = intern ("char-table-extra-slots"); | |
619 | |
620 /* Now we are ready to set up this property, so we can | |
621 create category tables. */ | |
622 Fput (Qcategory_table, Qchar_table_extra_slots, make_number (2)); | |
623 | |
624 Vstandard_category_table = Fmake_char_table (Qcategory_table, Qnil); | |
625 /* Set a category set which contains nothing to the default. */ | |
626 XCHAR_TABLE (Vstandard_category_table)->defalt = MAKE_CATEGORY_SET; | |
20189
16f5b56c2f68
(copy_category_table): Copy also the first extra slot
Kenichi Handa <handa@m17n.org>
parents:
19659
diff
changeset
|
627 Fset_char_table_extra_slot (Vstandard_category_table, make_number (0), |
17052 | 628 Fmake_vector (make_number (95), Qnil)); |
629 } | |
630 | |
21514 | 631 void |
17052 | 632 syms_of_category () |
633 { | |
634 Qcategoryp = intern ("categoryp"); | |
635 staticpro (&Qcategoryp); | |
636 Qcategorysetp = intern ("categorysetp"); | |
637 staticpro (&Qcategorysetp); | |
638 Qcategory_table_p = intern ("category-table-p"); | |
639 staticpro (&Qcategory_table_p); | |
640 | |
641 DEFVAR_LISP ("word-combining-categories", &Vword_combining_categories, | |
642 "List of pair (cons) of categories to determine word boundary.\n\ | |
643 \n\ | |
644 Emacs treats a sequence of word constituent characters as a single\n\ | |
645 word (i.e. finds no word boundary between them) iff they belongs to\n\ | |
646 the same charset. But, exceptions are allowed in the following cases.\n\ | |
647 \n\ | |
23543
6f3b920860e5
(syms_of_category): Doc-string modified.
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
648 \(1) The case that characters are in different charsets is controlled\n\ |
17052 | 649 by the variable `word-combining-categories'.\n\ |
650 \n\ | |
651 Emacs finds no word boundary between characters of different charsets\n\ | |
652 if they have categories matching some element of this list.\n\ | |
653 \n\ | |
654 More precisely, if an element of this list is a cons of category CAT1\n\ | |
655 and CAT2, and a multibyte character C1 which has CAT1 is followed by\n\ | |
656 C2 which has CAT2, there's no word boundary between C1 and C2.\n\ | |
657 \n\ | |
658 For instance, to tell that ASCII characters and Latin-1 characters can\n\ | |
659 form a single word, the element `(?l . ?l)' should be in this list\n\ | |
660 because both characters have the category `l' (Latin characters).\n\ | |
661 \n\ | |
23543
6f3b920860e5
(syms_of_category): Doc-string modified.
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
662 \(2) The case that character are in the same charset is controlled by\n\ |
17052 | 663 the variable `word-separating-categories'.\n\ |
664 \n\ | |
665 Emacs find a word boundary between characters of the same charset\n\ | |
666 if they have categories matching some element of this list.\n\ | |
667 \n\ | |
668 More precisely, if an element of this list is a cons of category CAT1\n\ | |
669 and CAT2, and a multibyte character C1 which has CAT1 is followed by\n\ | |
670 C2 which has CAT2, there's a word boundary between C1 and C2.\n\ | |
671 \n\ | |
672 For instance, to tell that there's a word boundary between Japanese\n\ | |
673 Hiragana and Japanese Kanji (both are in the same charset), the\n\ | |
674 element `(?H . ?C) should be in this list."); | |
675 | |
676 Vword_combining_categories = Qnil; | |
677 | |
678 DEFVAR_LISP ("word-separating-categories", &Vword_separating_categories, | |
679 "List of pair (cons) of categories to determine word boundary.\n\ | |
680 See the documentation of the variable `word-combining-categories'."); | |
681 | |
682 Vword_separating_categories = Qnil; | |
683 | |
684 defsubr (&Smake_category_set); | |
685 defsubr (&Sdefine_category); | |
686 defsubr (&Scategory_docstring); | |
687 defsubr (&Sget_unused_category); | |
688 defsubr (&Scategory_table_p); | |
689 defsubr (&Scategory_table); | |
690 defsubr (&Sstandard_category_table); | |
691 defsubr (&Scopy_category_table); | |
692 defsubr (&Sset_category_table); | |
693 defsubr (&Schar_category_set); | |
694 defsubr (&Scategory_set_mnemonics); | |
695 defsubr (&Smodify_category_entry); | |
20825
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
696 defsubr (&Sdescribe_categories); |
17052 | 697 |
698 category_table_version = 0; | |
699 } |