From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 23 Jan 2006 22:08:13 +0000 (+0000)
Subject: (x_catch_errors_unwind): Yet another int/Lisp_Object mixup.
X-Git-Tag: emacs-pretest-22.0.90~4607
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e5e26d8f7df1d5a8b4b2c431015f202324f3ec3b;p=emacs.git

(x_catch_errors_unwind): Yet another int/Lisp_Object mixup.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 66dcf16adb9..7a652d04049 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/xterm.c b/src/xterm.c
index 9b19dbb0f5e..114a7f12459 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7543,7 +7543,8 @@ x_catch_errors_unwind (dummy)
   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;
 }