comparison src/specifier.c @ 800:a5954632b187

[xemacs-hg @ 2002-03-31 08:27:14 by ben] more fixes, first crack at finishing behavior implementation TODO.ben-mule-21-5: Update. configure.in: Fix for new error-checking types. make-mswin-unicode.pl: Don't be fucked up by CRLF. Output code to force errors when nonintercepted Windows calls issued. behavior.el, dumped-lisp.el, menubar-items.el: Add support for saving using custom. Load into a dumped XEmacs. Correct :title to :short-doc in accordance with behavior-defs.el. Add a submenu under Options for turning on/off behaviors. cl-macs.el: Properly document `loop'. Fix a minor bug in keymap iteration and add support for bit-vector iteration. lisp-mode.el: Rearrange and add items for macro expanding. menubar-items.el: Document connection between these two functions. window.el: Port stuff from GNU 21.1. config.inc.samp, xemacs.mak: Separate out and add new variable for controlling error-checking. s/windowsnt.h: Use new ERROR_CHECK_ALL; not related to DEBUG_XEMACS. alloc.c, backtrace.h, buffer.c, buffer.h, bytecode.c, callproc.c, casetab.c, charset.h, chartab.c, cmdloop.c, config.h.in, console-msw.c, console-stream.c, console-tty.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dired-msw.c, dired.c, dumper.c, editfns.c, eldap.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, file-coding.h, fileio.c, frame-msw.c, frame.c, frame.h, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, insdel.c, intl-auto-encap-win32.c, intl-auto-encap-win32.h, intl-encap-win32.c, intl-win32.c, keymap.c, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-x.c, menubar.c, mule-coding.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, opaque.c, print.c, process-nt.c, process-unix.c, process.c, rangetab.c, redisplay-msw.c, redisplay-output.c, redisplay.c, regex.c, scrollbar-msw.c, select-msw.c, signal.c, specifier.c, specifier.h, symbols.c, sysdep.c, syswindows.h, text.c, text.h, toolbar-msw.c, tooltalk.c, ui-gtk.c, unicode.c, window.c: Redo error-checking macros: ERROR_CHECK_TYPECHECK -> ERROR_CHECK_TYPES, ERROR_CHECK_CHARBPOS -> ERROR_CHECK_TEXT, add ERROR_CHECK_DISPLAY, ERROR_CHECK_STRUCTURES. Document these in config.h.in. Fix code to follow docs. Fix *_checking_assert() in accordance with new names. Attempt to fix periodic redisplay crash freeing display line structures. Add first implementation of sledgehammer redisplay check. Redo print_*() to use write_fmt_string(), write_fmt_string_lisp(). Fix bug in md5 handling. Rename character-to-unicode to char-to-unicode; same for unicode-to-char{acter}. Move chartab documentation to `make-char-table'. Some header cleanup. Clean up remaining places where nonintercepted Windows calls are being used. automated/mule-tests.el: Fix for new Unicode support.
author ben
date Sun, 31 Mar 2002 08:30:17 +0000
parents e38acbeb1cae
children 2b676dc88c66
comparison
equal deleted inserted replaced
799:03d9f9084848 800:a5954632b187
30 30
31 #include <config.h> 31 #include <config.h>
32 #include "lisp.h" 32 #include "lisp.h"
33 33
34 #include "buffer.h" 34 #include "buffer.h"
35 #include "chartab.h"
35 #include "device.h" 36 #include "device.h"
36 #include "frame.h" 37 #include "frame.h"
38 #include "glyphs.h"
37 #include "opaque.h" 39 #include "opaque.h"
40 #include "rangetab.h"
38 #include "specifier.h" 41 #include "specifier.h"
39 #include "window.h" 42 #include "window.h"
40 #include "chartab.h"
41 #include "rangetab.h"
42 43
43 Lisp_Object Qspecifierp; 44 Lisp_Object Qspecifierp;
44 Lisp_Object Qremove_tag_set_prepend, Qremove_tag_set_append; 45 Lisp_Object Qremove_tag_set_prepend, Qremove_tag_set_append;
45 Lisp_Object Qremove_locale, Qremove_locale_type; 46 Lisp_Object Qremove_locale, Qremove_locale_type;
46 47
263 264
264 static void 265 static void
265 print_specifier (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) 266 print_specifier (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
266 { 267 {
267 Lisp_Specifier *sp = XSPECIFIER (obj); 268 Lisp_Specifier *sp = XSPECIFIER (obj);
268 char buf[100];
269 int count = specpdl_depth (); 269 int count = specpdl_depth ();
270 Lisp_Object the_specs; 270 Lisp_Object the_specs;
271 271
272 if (print_readably) 272 if (print_readably)
273 printing_unreadable_object ("#<%s-specifier 0x%x>", 273 printing_unreadable_object ("#<%s-specifier 0x%x>",
274 sp->methods->name, sp->header.uid); 274 sp->methods->name, sp->header.uid);
275 275
276 sprintf (buf, "#<%s-specifier global=", sp->methods->name); 276 write_fmt_string (printcharfun, "#<%s-specifier global=", sp->methods->name);
277 write_c_string (buf, printcharfun);
278 specbind (Qprint_string_length, make_int (100)); 277 specbind (Qprint_string_length, make_int (100));
279 specbind (Qprint_length, make_int (5)); 278 specbind (Qprint_length, make_int (5));
280 the_specs = Fspecifier_specs (obj, Qglobal, Qnil, Qnil); 279 the_specs = Fspecifier_specs (obj, Qglobal, Qnil, Qnil);
281 if (NILP (the_specs)) 280 if (NILP (the_specs))
282 /* there are no global specs */ 281 /* there are no global specs */
283 write_c_string ("<unspecified>", printcharfun); 282 write_c_string ("<unspecified>", printcharfun);
284 else 283 else
285 print_internal (the_specs, printcharfun, 1); 284 print_internal (the_specs, printcharfun, 1);
286 if (!NILP (sp->fallback)) 285 if (!NILP (sp->fallback))
287 { 286 {
288 write_c_string (" fallback=", printcharfun); 287 write_fmt_string_lisp (printcharfun, " fallback=%S", 1, sp->fallback);
289 print_internal (sp->fallback, printcharfun, escapeflag);
290 } 288 }
291 unbind_to (count); 289 unbind_to (count);
292 sprintf (buf, " 0x%x>", sp->header.uid); 290 write_fmt_string (printcharfun, " 0x%x>", sp->header.uid);
293 write_c_string (buf, printcharfun);
294 } 291 }
295 292
296 static void 293 static void
297 finalize_specifier (void *header, int for_disksave) 294 finalize_specifier (void *header, int for_disksave)
298 { 295 {