(Fdisplay_buffer): Use NILP.

(Fset_window_scroll_bars): Likewise.

diff --git a/src/ChangeLog b/src/ChangeLog
index ab4210134f013c0f7279be6c18b7ccc128ad015f..2d0300f8a55435eea1471445e5fa19608f472f99 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-16  Andreas Schwab  <schwab@suse.de>
+
+       * window.c (Fdisplay_buffer): Use NILP.
+       (Fset_window_scroll_bars): Likewise.
+
 2007-07-15  Martin Rudalics  <rudalics@gmx.at>
 
        * window.c (window_min_size_2): New function.

diff --git a/src/window.c b/src/window.c
index 90e2e09da51f8e2e6439da15a2ec4c54d18b46bd..c32b1a34f7d1395fd60b51fcce9a51c95703c58c 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -3757,7 +3757,7 @@ displayed.  */)
          if (!NILP (window)
              && ! FRAME_NO_SPLIT_P (XFRAME (XWINDOW (window)->frame))
              && (EQ (window, selected_window)
-                 || EQ (XWINDOW (window)->parent, Qnil))
+                 || NILP (XWINDOW (window)->parent))
              && window_height (window) >= split_height_threshold
              && (window_height (window)
                  >= (2 * window_min_size_2 (XWINDOW (window), 0))))
@@ -6909,7 +6909,7 @@ Fourth parameter HORIZONTAL-TYPE is currently unused.  */)
        vertical_type = Qnil;
     }
 
-  if (!(EQ (vertical_type, Qnil)
+  if (!(NILP (vertical_type)
        || EQ (vertical_type, Qleft)
        || EQ (vertical_type, Qright)
        || EQ (vertical_type, Qt)))