Mercurial > hg > xemacs-beta
diff src/events.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 | 2a462149bd6a |
line wrap: on
line diff
--- a/src/events.c Wed Jan 20 07:05:57 2010 -0600 +++ b/src/events.c Wed Feb 24 01:58:04 2010 -0600 @@ -311,10 +311,10 @@ } static void -print_event_1 (const char *str, Lisp_Object obj, Lisp_Object printcharfun) +print_event_1 (const Ascbyte *str, Lisp_Object obj, Lisp_Object printcharfun) { DECLARE_EISTRING_MALLOC (ei); - write_c_string (printcharfun, str); + write_ascstring (printcharfun, str); format_event_object (ei, obj, 0); write_eistring (printcharfun, ei); eifree (ei); @@ -362,7 +362,7 @@ XEVENT_TIMEOUT_OBJECT (obj)); break; case empty_event: - write_c_string (printcharfun, "#<empty-event"); + write_ascstring (printcharfun, "#<empty-event"); break; case misc_user_event: write_fmt_string_lisp (printcharfun, "#<misc-user-event (%S", 1, @@ -377,17 +377,18 @@ XEVENT_EVAL_OBJECT (obj)); break; case dead_event: - write_c_string (printcharfun, "#<DEALLOCATED-EVENT"); + write_ascstring (printcharfun, "#<DEALLOCATED-EVENT"); break; default: - write_c_string (printcharfun, "#<UNKNOWN-EVENT-TYPE"); + write_ascstring (printcharfun, "#<UNKNOWN-EVENT-TYPE"); break; } - write_c_string (printcharfun, ">"); + write_ascstring (printcharfun, ">"); } static int -event_equal (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth)) +event_equal (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth), + int UNUSED (foldcase)) { Lisp_Event *e1 = XEVENT (obj1); Lisp_Event *e2 = XEVENT (obj2);