Fix invalid uses of Lisp_Object

* window.c (Fresize_window_apply): Use EQ to compare Lisp_Object
values.
(Fdelete_window_internal): Likewise.
(shrink_mini_window): Declare size as EMACS_INT.

diff --git a/src/ChangeLog b/src/ChangeLog
index 31f0bd6eeac8f65390ecbf6fe3b4d06c2c1145f6..f2275fba426ba9381b1fb0fc066e994495384113 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-30  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * window.c (Fresize_window_apply): Use EQ to compare Lisp_Object
+       values.
+       (Fdelete_window_internal): Likewise.
+       (shrink_mini_window): Declare size as EMACS_INT.
+
 2010-10-29  Eli Zaretskii  <eliz@gnu.org>
 
        * emacs.c (main): Call syms_of_filelock unconditionally.

diff --git a/src/window.c b/src/window.c
index 5de34ce3791c9c9284f30e1997e915f991f4752e..2c80f8bb82885b6940302355dda2ea749b185f32 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -3562,7 +3562,7 @@ be applied on the Elisp level.  */)
   r = XWINDOW (FRAME_ROOT_WINDOW (f));
 
   if (!resize_window_check (r, horflag)
-      || (r->new_total != (horflag ? r->total_cols : r->total_lines)))
+      || ! EQ (r->new_total, horflag ? r->total_cols : r->total_lines))
     return Qnil;
 
   BLOCK_INPUT;
@@ -3930,7 +3930,7 @@ when WINDOW is the only window on its frame.  */)
     }
 
   if (resize_window_check (r, horflag)
-      && r->new_total == (horflag ? r->total_cols : r->total_lines))
+      && EQ (r->new_total, horflag ? r->total_cols : r->total_lines))
     /* We can delete WINDOW now.  */
     {
       /* Block input.  */
@@ -4001,7 +4001,7 @@ when WINDOW is the only window on its frame.  */)
          /* Now look whether `get-mru-window' gets us something.  */
          mru_window = call1 (Qget_mru_window, frame);
          if (WINDOW_LIVE_P (mru_window)
-             && XWINDOW (mru_window)->frame == frame)
+             && EQ (XWINDOW (mru_window)->frame, frame))
            new_selected_window = mru_window;
 
          /* If all ended up well, we now promote the mru window.  */
@@ -4081,7 +4081,8 @@ shrink_mini_window (struct window *w)
 {
   struct frame *f = XFRAME (w->frame);
   struct window *r;
-  Lisp_Object root, value, size;
+  Lisp_Object root, value;
+  EMACS_INT size;
 
   xassert (MINI_WINDOW_P (w));