Mercurial > emacs
comparison src/lisp.h @ 13241:b1d118fb7b3e
(UPCASE_TABLE): Definition deleted.
(UPPERCASEP, LOWERCASEP, NOCASEP, UPCASE, UPCASE1, DOWNCASE)
(DOWNCASE_TABLE): Case tables are now char-tables.
(Vascii_upcase_table, Vascii_canon_table, Vascii_eqv_table):
Declarations deleted.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Thu, 19 Oct 1995 00:13:45 +0000 |
parents | b307cd5c259f |
children | eac254855aad |
comparison
equal
deleted
inserted
replaced
13240:f6e51f3f092a | 13241:b1d118fb7b3e |
---|---|
1225 #define QUITP (!NILP (Vquit_flag) && NILP (Vinhibit_quit)) | 1225 #define QUITP (!NILP (Vquit_flag) && NILP (Vinhibit_quit)) |
1226 | 1226 |
1227 /* 1 if CH is upper case. */ | 1227 /* 1 if CH is upper case. */ |
1228 | 1228 |
1229 #define UPPERCASEP(CH) \ | 1229 #define UPPERCASEP(CH) \ |
1230 (XSTRING (current_buffer->downcase_table)->data[CH] != (CH)) | 1230 (XCHAR_TABLE (current_buffer->downcase_table)->contents[CH] != (CH)) |
1231 | 1231 |
1232 /* 1 if CH is lower case. */ | 1232 /* 1 if CH is lower case. */ |
1233 | 1233 |
1234 #define LOWERCASEP(CH) \ | 1234 #define LOWERCASEP(CH) \ |
1235 (!UPPERCASEP (CH) \ | 1235 (!UPPERCASEP (CH) \ |
1236 && XSTRING (current_buffer->upcase_table)->data[CH] != (CH)) | 1236 && XCHAR_TABLE (current_buffer->upcase_table)->contents[CH] != (CH)) |
1237 | 1237 |
1238 /* 1 if CH is neither upper nor lower case. */ | 1238 /* 1 if CH is neither upper nor lower case. */ |
1239 | 1239 |
1240 #define NOCASEP(CH) (XSTRING (current_buffer->upcase_table)->data[CH] == (CH)) | 1240 #define NOCASEP(CH) \ |
1241 (XCHAR_TABLE (current_buffer->upcase_table)->contents[CH] == (CH)) | |
1241 | 1242 |
1242 /* Upcase a character, or make no change if that cannot be done. */ | 1243 /* Upcase a character, or make no change if that cannot be done. */ |
1243 | 1244 |
1244 #define UPCASE(CH) \ | 1245 #define UPCASE(CH) \ |
1245 (XSTRING (current_buffer->downcase_table)->data[CH] == (CH) \ | 1246 (XCHAR_TABLE (current_buffer->downcase_table)->contents[CH] == (CH) \ |
1246 ? UPCASE1 (CH) : (CH)) | 1247 ? UPCASE1 (CH) : (CH)) |
1247 | 1248 |
1248 /* Upcase a character known to be not upper case. */ | 1249 /* Upcase a character known to be not upper case. */ |
1249 | 1250 |
1250 #define UPCASE1(CH) (XSTRING (current_buffer->upcase_table)->data[CH]) | 1251 #define UPCASE1(CH) (XCHAR_TABLE (current_buffer->upcase_table)->contents[CH]) |
1251 | 1252 |
1252 /* Downcase a character, or make no change if that cannot be done. */ | 1253 /* Downcase a character, or make no change if that cannot be done. */ |
1253 | 1254 |
1254 #define DOWNCASE(CH) (XSTRING (current_buffer->downcase_table)->data[CH]) | 1255 #define DOWNCASE(CH) \ |
1256 (XCHAR_TABLE (current_buffer->downcase_table)->contents[CH]) | |
1255 | 1257 |
1256 /* Current buffer's map from characters to lower-case characters. */ | 1258 /* Current buffer's map from characters to lower-case characters. */ |
1257 | 1259 |
1258 #define DOWNCASE_TABLE XSTRING (current_buffer->downcase_table)->data | 1260 #define DOWNCASE_TABLE XCHAR_TABLE (current_buffer->downcase_table)->contents |
1259 | 1261 |
1260 /* Table mapping each char to the next char with the same lowercase version. | 1262 extern Lisp_Object Vascii_downcase_table; |
1261 This mapping is a no-op only for characters that don't have case. */ | |
1262 #define UPCASE_TABLE XSTRING (current_buffer->upcase_table)->data | |
1263 | |
1264 extern Lisp_Object Vascii_downcase_table, Vascii_upcase_table; | |
1265 extern Lisp_Object Vascii_canon_table, Vascii_eqv_table; | |
1266 | 1263 |
1267 /* Number of bytes of structure consed since last GC. */ | 1264 /* Number of bytes of structure consed since last GC. */ |
1268 | 1265 |
1269 extern int consing_since_gc; | 1266 extern int consing_since_gc; |
1270 | 1267 |