Mercurial > emacs
changeset 68360:f192b7797d85
(x_catch_errors_unwind): Yet another int/Lisp_Object mixup.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 23 Jan 2006 22:08:13 +0000 |
| parents | b9aec3e50e4f |
| children | f59a5a15358d |
| files | src/ChangeLog src/xterm.c |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Jan 23 22:04:36 2006 +0000 +++ b/src/ChangeLog Mon Jan 23 22:08:13 2006 +0000 @@ -1,3 +1,7 @@ +2006-01-23 Stefan Monnier <monnier@iro.umontreal.ca> + + * xterm.c (x_catch_errors_unwind): Yet another int/Lisp_Object mixup. + 2006-01-23 Kim F. Storm <storm@cua.dk> * xdisp.c (handle_single_display_spec): Fix handling of space
--- a/src/xterm.c Mon Jan 23 22:04:36 2006 +0000 +++ b/src/xterm.c Mon Jan 23 22:08:13 2006 +0000 @@ -7543,7 +7543,8 @@ x_error_message = x_error_message->prev; free (tmp); - eassert (dummy == make_number ((EMACS_INT)dpy + (EMACS_INT)x_error_message)); + eassert (EQ (dummy, + make_number ((EMACS_INT)dpy + (EMACS_INT)x_error_message))); return Qnil; }