[Emacs-diffs] /srv/bzr/emacs/trunk r105086: * src/xdisp.c (Ftool_bar_lines_needed): Fix WINDOWP check.

[Johan Bockgård]

------------------------------------------------------------
revno: 105086
committer: Johan Bockgård <address@hidden>
branch nick: trunk
timestamp: Sun 2011-07-10 23:49:05 +0200
message:
  * src/xdisp.c (Ftool_bar_lines_needed): Fix WINDOWP check.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-07-10 16:55:22 +0000
+++ b/src/ChangeLog     2011-07-10 21:49:05 +0000
@@ -1,3 +1,7 @@
+2011-07-10  Johan Bockgård  <address@hidden>
+
+       * xdisp.c (Ftool_bar_lines_needed): Fix WINDOWP check.
+
 2011-07-10  Jan Djärv  <address@hidden>
 
        * xmenu.c (menu_highlight_callback): Only pass frame to show_help_event

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-07-10 08:20:10 +0000
+++ b/src/xdisp.c       2011-07-10 21:49:05 +0000
@@ -10509,7 +10509,7 @@
   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);