From: Andreas Schwab <schwab@suse.de>
Date: Mon, 16 Jul 2007 13:22:13 +0000 (+0000)
Subject: (Fdisplay_buffer): Use NILP.
X-Git-Tag: emacs-pretest-23.0.90~11887
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=413a79ad664be5cf43a3b1b1136f5625bf14bc8f;p=emacs.git

(Fdisplay_buffer): Use NILP.
(Fset_window_scroll_bars): Likewise.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index ab4210134f0..2d0300f8a55 100644
--- 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 90e2e09da51..c32b1a34f7d 100644
--- 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)))