diff options
Diffstat (limited to 'src/charset.c')
| -rw-r--r-- | src/charset.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/src/charset.c b/src/charset.c index 33436d53f63..ea1480e806a 100644 --- a/src/charset.c +++ b/src/charset.c | |||
| @@ -66,16 +66,7 @@ struct charset *charset_table; | |||
| 66 | static ptrdiff_t charset_table_size; | 66 | static ptrdiff_t charset_table_size; |
| 67 | static int charset_table_used; | 67 | static int charset_table_used; |
| 68 | 68 | ||
| 69 | Lisp_Object Qcharsetp; | 69 | /* Special charsets corresponding to symbols. */ |
| 70 | |||
| 71 | /* Special charset symbols. */ | ||
| 72 | Lisp_Object Qascii; | ||
| 73 | static Lisp_Object Qeight_bit; | ||
| 74 | static Lisp_Object Qiso_8859_1; | ||
| 75 | static Lisp_Object Qunicode; | ||
| 76 | static Lisp_Object Qemacs; | ||
| 77 | |||
| 78 | /* The corresponding charsets. */ | ||
| 79 | int charset_ascii; | 70 | int charset_ascii; |
| 80 | int charset_eight_bit; | 71 | int charset_eight_bit; |
| 81 | static int charset_iso_8859_1; | 72 | static int charset_iso_8859_1; |
| @@ -88,9 +79,6 @@ int charset_jisx0208_1978; | |||
| 88 | int charset_jisx0208; | 79 | int charset_jisx0208; |
| 89 | int charset_ksc5601; | 80 | int charset_ksc5601; |
| 90 | 81 | ||
| 91 | /* Value of charset attribute `charset-iso-plane'. */ | ||
| 92 | static Lisp_Object Qgl, Qgr; | ||
| 93 | |||
| 94 | /* Charset of unibyte characters. */ | 82 | /* Charset of unibyte characters. */ |
| 95 | int charset_unibyte; | 83 | int charset_unibyte; |
| 96 | 84 | ||
| @@ -2344,12 +2332,14 @@ syms_of_charset (void) | |||
| 2344 | { | 2332 | { |
| 2345 | DEFSYM (Qcharsetp, "charsetp"); | 2333 | DEFSYM (Qcharsetp, "charsetp"); |
| 2346 | 2334 | ||
| 2335 | /* Special charset symbols. */ | ||
| 2347 | DEFSYM (Qascii, "ascii"); | 2336 | DEFSYM (Qascii, "ascii"); |
| 2348 | DEFSYM (Qunicode, "unicode"); | 2337 | DEFSYM (Qunicode, "unicode"); |
| 2349 | DEFSYM (Qemacs, "emacs"); | 2338 | DEFSYM (Qemacs, "emacs"); |
| 2350 | DEFSYM (Qeight_bit, "eight-bit"); | 2339 | DEFSYM (Qeight_bit, "eight-bit"); |
| 2351 | DEFSYM (Qiso_8859_1, "iso-8859-1"); | 2340 | DEFSYM (Qiso_8859_1, "iso-8859-1"); |
| 2352 | 2341 | ||
| 2342 | /* Value of charset attribute `charset-iso-plane'. */ | ||
| 2353 | DEFSYM (Qgl, "gl"); | 2343 | DEFSYM (Qgl, "gl"); |
| 2354 | DEFSYM (Qgr, "gr"); | 2344 | DEFSYM (Qgr, "gr"); |
| 2355 | 2345 | ||
| @@ -2362,10 +2352,6 @@ syms_of_charset (void) | |||
| 2362 | staticpro (&Vemacs_mule_charset_list); | 2352 | staticpro (&Vemacs_mule_charset_list); |
| 2363 | Vemacs_mule_charset_list = Qnil; | 2353 | Vemacs_mule_charset_list = Qnil; |
| 2364 | 2354 | ||
| 2365 | /* Don't staticpro them here. It's done in syms_of_fns. */ | ||
| 2366 | QCtest = intern_c_string (":test"); | ||
| 2367 | Qeq = intern_c_string ("eq"); | ||
| 2368 | |||
| 2369 | staticpro (&Vcharset_hash_table); | 2355 | staticpro (&Vcharset_hash_table); |
| 2370 | { | 2356 | { |
| 2371 | Lisp_Object args[2]; | 2357 | Lisp_Object args[2]; |