Mercurial > hg > xemacs-beta

comparison src/window.c @ 5143:186aebf7f6c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
307 int UNUSED (escapeflag)) 307 int UNUSED (escapeflag))
308 { 308 {
309 Lisp_Object buf; 309 Lisp_Object buf;
310 310
311 if (print_readably) 311 if (print_readably)
312 printing_unreadable_lcrecord (obj, 0); 312 printing_unreadable_lisp_object (obj, 0);
313 313
314 write_ascstring (printcharfun, "#<window"); 314 write_ascstring (printcharfun, "#<window");
315 buf = XWINDOW_BUFFER (obj); 315 buf = XWINDOW_BUFFER (obj);
316 if (EQ (buf, Qt)) 316 if (EQ (buf, Qt))
317 write_ascstring (printcharfun, " during creation"); 317 write_ascstring (printcharfun, " during creation");
319 { 319 {
320 320
321 Lisp_Object name = XBUFFER (buf)->name; 321 Lisp_Object name = XBUFFER (buf)->name;
322 write_fmt_string_lisp (printcharfun, " on %S", 1, name); 322 write_fmt_string_lisp (printcharfun, " on %S", 1, name);
323 } 323 }
324 write_fmt_string (printcharfun, " 0x%x>", XWINDOW (obj)->header.uid); 324 write_fmt_string (printcharfun, " 0x%x>",
325 NORMAL_LISP_OBJECT_UID (XWINDOW (obj)));
325 } 326 }
326 327
327 static void 328 static void
328 finalize_window (Lisp_Object obj) 329 finalize_window (Lisp_Object obj)
329 { 330 {
676 #ifdef HAVE_SCROLLBARS 677 #ifdef HAVE_SCROLLBARS
677 release_window_mirror_scrollbars (mir); 678 release_window_mirror_scrollbars (mir);
678 #endif 679 #endif
679 free_display_structs (mir); 680 free_display_structs (mir);
680 mir = mir->next; 681 mir = mir->next;
681 /* not worth calling free_managed_lcrecord() -- window mirrors 682 /* not worth calling free_normal_lisp_object() -- window mirrors
682 are not created that frequently and it's dangerous. we don't 683 are not created that frequently and it's dangerous. we don't
683 know for sure that there aren't other pointers around -- e.g. 684 know for sure that there aren't other pointers around -- e.g.
684 in a scrollbar instance. */ 685 in a scrollbar instance. */
685 } 686 }
686 } 687 }
5404 { 5405 {
5405 Lisp_Object buffer = XWINDOW (window)->buffer; 5406 Lisp_Object buffer = XWINDOW (window)->buffer;
5406 if (!NILP (buffer) && BUFFERP (buffer)) 5407 if (!NILP (buffer) && BUFFERP (buffer))
5407 stderr_out (" on %s", XSTRING_DATA (XBUFFER (buffer)->name)); 5408 stderr_out (" on %s", XSTRING_DATA (XBUFFER (buffer)->name));
5408 } 5409 }
5409 stderr_out (" 0x%x>", XWINDOW (window)->header.uid); 5410 stderr_out (" 0x%x>", NORMAL_LISP_OBJECT_UID (XWINDOW (window)));
5410 5411
5411 while (!NILP (child)) 5412 while (!NILP (child))
5412 { 5413 {
5413 debug_print_window (child, level + 1); 5414 debug_print_window (child, level + 1);
5414 child = Fwindow_next_child (child); 5415 child = Fwindow_next_child (child);