comparison src/xterm.c @ 90314:d1c5430c5bff

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-21 Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 97-112) - Update from CVS - Merge from erc--emacs--0 - Update from CVS: src/regex.c (extend_range_table_work_area): Fix typo. - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 37) - Update from CVS
author Miles Bader <miles@gnu.org>
date Wed, 22 Feb 2006 06:54:10 +0000
parents 5b7fa3a2f66c b8d7bffaf333
children 8a1ee48a8386
comparison
equal deleted inserted replaced
90313:496f6d9b9d20 90314:d1c5430c5bff
7565 int 7565 int
7566 x_catch_errors (dpy) 7566 x_catch_errors (dpy)
7567 Display *dpy; 7567 Display *dpy;
7568 { 7568 {
7569 int count = SPECPDL_INDEX (); 7569 int count = SPECPDL_INDEX ();
7570 struct x_error_message_stack *data = malloc (sizeof (*data)); 7570 struct x_error_message_stack *data = xmalloc (sizeof (*data));
7571 Lisp_Object dummy; 7571 Lisp_Object dummy;
7572 #ifdef ENABLE_CHECKING 7572 #ifdef ENABLE_CHECKING
7573 dummy = make_number ((EMACS_INT)dpy + (EMACS_INT)x_error_message); 7573 dummy = make_number ((EMACS_INT)dpy + (EMACS_INT)x_error_message);
7574 #else 7574 #else
7575 dummy = Qnil; 7575 dummy = Qnil;