From: Johan Bockgård <bojohan@gnu.org>
Date: Sun, 10 Jul 2011 21:49:05 +0000 (+0200)
Subject: * src/xdisp.c (Ftool_bar_lines_needed): Fix WINDOWP check.
X-Git-Tag: emacs-pretest-24.0.90~104^2~397
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8974cc9fd18fe4b5e91702c3ba8491f349f37cf8;p=emacs.git

* src/xdisp.c (Ftool_bar_lines_needed): Fix WINDOWP check.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 020972edd2d..4aa8fa9c95c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-10  Johan Bockgård  <bojohan@gnu.org>
+
+	* xdisp.c (Ftool_bar_lines_needed): Fix WINDOWP check.
+
 2011-07-10  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* xmenu.c (menu_highlight_callback): Only pass frame to show_help_event
diff --git a/src/xdisp.c b/src/xdisp.c
index 871317d86b8..a86cca86341 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10509,7 +10509,7 @@ DEFUN ("tool-bar-lines-needed", Ftool_bar_lines_needed, Stool_bar_lines_needed,
   f = XFRAME (frame);
 
   if (WINDOWP (f->tool_bar_window)
-      || (w = XWINDOW (f->tool_bar_window),
+      && (w = XWINDOW (f->tool_bar_window),
 	  WINDOW_TOTAL_LINES (w) > 0))
     {
       update_tool_bar (f, 1);