comparison src/marker.c @ 5125:b5df3737028a ben-lisp-object

merge
author Ben Wing <ben@xemacs.org>
date Wed, 24 Feb 2010 01:58:04 -0600
parents 623d57b7fbe8 e813cf16c015
children a9c41067dd88
comparison
equal deleted inserted replaced
5124:623d57b7fbe8 5125:b5df3737028a
60 Lisp_Marker *marker = XMARKER (obj); 60 Lisp_Marker *marker = XMARKER (obj);
61 61
62 if (print_readably) 62 if (print_readably)
63 printing_unreadable_object ("#<marker 0x%lx>", (long) marker); 63 printing_unreadable_object ("#<marker 0x%lx>", (long) marker);
64 64
65 write_c_string (printcharfun, GETTEXT ("#<marker ")); 65 write_ascstring (printcharfun, GETTEXT ("#<marker "));
66 if (!marker->buffer) 66 if (!marker->buffer)
67 write_c_string (printcharfun, GETTEXT ("in no buffer")); 67 write_ascstring (printcharfun, GETTEXT ("in no buffer"));
68 else 68 else
69 { 69 {
70 write_fmt_string (printcharfun, "at %ld in ", 70 write_fmt_string (printcharfun, "at %ld in ",
71 (long) marker_position (obj)); 71 (long) marker_position (obj));
72 print_internal (marker->buffer->name, printcharfun, 0); 72 print_internal (marker->buffer->name, printcharfun, 0);
73 } 73 }
74 if (marker->insertion_type) 74 if (marker->insertion_type)
75 write_c_string (printcharfun, " insertion-type=t"); 75 write_ascstring (printcharfun, " insertion-type=t");
76 write_fmt_string (printcharfun, " 0x%lx>", (long) marker); 76 write_fmt_string (printcharfun, " 0x%lx>", (long) marker);
77 } 77 }
78 78
79 static int 79 static int
80 marker_equal (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth)) 80 marker_equal (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth),
81 int UNUSED (foldcase))
81 { 82 {
82 Lisp_Marker *marker1 = XMARKER (obj1); 83 Lisp_Marker *marker1 = XMARKER (obj1);
83 Lisp_Marker *marker2 = XMARKER (obj2); 84 Lisp_Marker *marker2 = XMARKER (obj2);
84 85
85 return ((marker1->buffer == marker2->buffer) && 86 return ((marker1->buffer == marker2->buffer) &&