# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1138054093 0
# Node ID f192b7797d855fb7c9520210e83d2333983e7b5b
# Parent  b9aec3e50e4fea9588bc1aaf73d493723f158047
(x_catch_errors_unwind): Yet another int/Lisp_Object mixup.

diff -r b9aec3e50e4f -r f192b7797d85 src/ChangeLog
--- 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
diff -r b9aec3e50e4f -r f192b7797d85 src/xterm.c
--- 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;
 }