Mercurial > hg > xemacs-beta

comparison src/chartab.c @ 4990:8f0cf4fd3d2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automatic merge
author Ben Wing <ben@xemacs.org>
date Sat, 06 Feb 2010 04:01:46 -0600
parents e813cf16c015
children ae48681c47fa
comparison
equal deleted inserted replaced
4989:d2ec55325515 4990:8f0cf4fd3d2c
226 } 226 }
227 227
228 static void 228 static void
229 decode_char_table_range (Lisp_Object range, struct chartab_range *outrange) 229 decode_char_table_range (Lisp_Object range, struct chartab_range *outrange)
230 { 230 {
231 xzero (*outrange);
231 if (EQ (range, Qt)) 232 if (EQ (range, Qt))
232 outrange->type = CHARTAB_RANGE_ALL; 233 outrange->type = CHARTAB_RANGE_ALL;
233 else if (CHAR_OR_CHAR_INTP (range)) 234 else if (CHAR_OR_CHAR_INTP (range))
234 { 235 {
235 outrange->type = CHARTAB_RANGE_CHAR; 236 outrange->type = CHARTAB_RANGE_CHAR;
313 { 314 {
314 struct ptemap *a = (struct ptemap *) arg; 315 struct ptemap *a = (struct ptemap *) arg;
315 struct gcpro gcpro1; 316 struct gcpro gcpro1;
316 Lisp_Object lisprange; 317 Lisp_Object lisprange;
317 if (!a->first) 318 if (!a->first)
318 write_c_string (a->printcharfun, " "); 319 write_ascstring (a->printcharfun, " ");
319 a->first = 0; 320 a->first = 0;
320 lisprange = encode_char_table_range (range); 321 lisprange = encode_char_table_range (range);
321 GCPRO1 (lisprange); 322 GCPRO1 (lisprange);
322 write_fmt_string_lisp (a->printcharfun, "%s %S", 2, lisprange, val); 323 write_fmt_string_lisp (a->printcharfun, "%s %S", 2, lisprange, val);
323 UNGCPRO; 324 UNGCPRO;
337 arg.first = 1; 338 arg.first = 1;
338 339
339 write_fmt_string_lisp (printcharfun, "#s(char-table type %s data (", 340 write_fmt_string_lisp (printcharfun, "#s(char-table type %s data (",
340 1, char_table_type_to_symbol (ct->type)); 341 1, char_table_type_to_symbol (ct->type));
341 map_char_table (obj, &range, print_table_entry, &arg); 342 map_char_table (obj, &range, print_table_entry, &arg);
342 write_c_string (printcharfun, "))"); 343 write_ascstring (printcharfun, "))");
343 344
344 /* #### need to print and read the default; but that will allow the 345 /* #### need to print and read the default; but that will allow the
345 default to be modified, which we don't (yet) support -- but FSF does */ 346 default to be modified, which we don't (yet) support -- but FSF does */
346 } 347 }
347 348