comparison src/keymap.c @ 5143:186aebf7f6c6

merge
author Ben Wing <ben@xemacs.org>
date Sat, 13 Mar 2010 11:38:54 -0600
parents f965e31a35f0
children 88bd4f3ef8e4
comparison
equal deleted inserted replaced
5140:e5380fdaf8f1 5143:186aebf7f6c6
282 int UNUSED (escapeflag)) 282 int UNUSED (escapeflag))
283 { 283 {
284 /* This function can GC */ 284 /* This function can GC */
285 Lisp_Keymap *keymap = XKEYMAP (obj); 285 Lisp_Keymap *keymap = XKEYMAP (obj);
286 if (print_readably) 286 if (print_readably)
287 printing_unreadable_lcrecord (obj, 0); 287 printing_unreadable_lisp_object (obj, 0);
288 write_ascstring (printcharfun, "#<keymap "); 288 write_ascstring (printcharfun, "#<keymap ");
289 if (!NILP (keymap->name)) 289 if (!NILP (keymap->name))
290 { 290 {
291 write_fmt_string_lisp (printcharfun, "%S ", 1, keymap->name); 291 write_fmt_string_lisp (printcharfun, "%S ", 1, keymap->name);
292 } 292 }
293 write_fmt_string (printcharfun, "size %ld 0x%x>", 293 write_fmt_string (printcharfun, "size %ld 0x%x>",
294 (long) XINT (Fkeymap_fullness (obj)), keymap->header.uid); 294 (long) XINT (Fkeymap_fullness (obj)), NORMAL_LISP_OBJECT_UID (keymap));
295 } 295 }
296 296
297 static const struct memory_description keymap_description[] = { 297 static const struct memory_description keymap_description[] = {
298 #define MARKED_SLOT(x) { XD_LISP_OBJECT, offsetof (Lisp_Keymap, x) }, 298 #define MARKED_SLOT(x) { XD_LISP_OBJECT, offsetof (Lisp_Keymap, x) },
299 #include "keymap-slots.h" 299 #include "keymap-slots.h"