* src/xdisp.c (REDISPLAY_SOME_P): New macro.

(redisplay_internal): Use it.
(prepare_menu_bars, redisplay_window): Use it as well.

Fixes: debbugs:15999

diff --git a/src/ChangeLog b/src/ChangeLog
index 1fa027b1f5a37d333b211fb9df727cf374c92d1d..0810d083f3394b574cc16f18735364df6e7a9a3b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2013-11-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * xdisp.c (REDISPLAY_SOME_P): New macro.
+       (redisplay_internal): Use it (bug#15999).
+       (prepare_menu_bars, redisplay_window): Use it as well.
+
        * lisp.mk (lisp): Add electric.elc.
 
 2013-11-29  Tom Seddon  <emacs@tomseddon.plus.com>  (tiny change)

diff --git a/src/xdisp.c b/src/xdisp.c
index 509780b50d1db23c3a520ba3557c93c000e97f6a..0311d5d2d753ec15a39a9e03c7dec88e911ab27c 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2870,8 +2870,8 @@ init_iterator (struct it *it, struct window *w,
     }
   else
     {
-      it->first_visible_x =
-       window_hscroll_limited (it->w, it->f) * FRAME_COLUMN_WIDTH (it->f);
+      it->first_visible_x
+       = window_hscroll_limited (it->w, it->f) * FRAME_COLUMN_WIDTH (it->f);
       it->last_visible_x = (it->first_visible_x
                            + window_box_width (w, TEXT_AREA));
 
@@ -11198,6 +11198,12 @@ x_consider_frame_title (Lisp_Object frame)
                              Menu Bars
  ***********************************************************************/
 
+/* Non-zero if we will not redisplay all visible windows.  */
+#define REDISPLAY_SOME_P()                             \
+  ((windows_or_buffers_changed == 0                    \
+    || windows_or_buffers_changed == REDISPLAY_SOME)   \
+   && (update_mode_lines == 0                          \
+       || update_mode_lines == REDISPLAY_SOME))
 
 /* Prepare for redisplay by updating menu-bar item lists when
    appropriate.  This can call eval.  */
@@ -11206,10 +11212,7 @@ static void
 prepare_menu_bars (void)
 {
   bool all_windows = windows_or_buffers_changed || update_mode_lines;
-  bool some_windows = ((windows_or_buffers_changed == 0
-                       || windows_or_buffers_changed == REDISPLAY_SOME)
-                      && (update_mode_lines == 0
-                          || update_mode_lines == REDISPLAY_SOME));
+  bool some_windows = REDISPLAY_SOME_P ();
   struct gcpro gcpro1, gcpro2;
   Lisp_Object tooltip_frame;
 
@@ -13414,7 +13417,7 @@ redisplay_internal (void)
            {
              bool gcscrollbars
                /* Only GC scollbars when we redisplay the whole frame.  */
-               = f->redisplay || windows_or_buffers_changed != REDISPLAY_SOME;
+               = f->redisplay || !REDISPLAY_SOME_P ();
              /* Mark all the scroll bars to be removed; we'll redeem
                 the ones we want when we redisplay their windows.  */
              if (gcscrollbars && FRAME_TERMINAL (f)->condemn_scroll_bars_hook)
@@ -15409,10 +15412,7 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
 #endif
 
   if (!just_this_one_p
-      && (update_mode_lines == REDISPLAY_SOME
-         || update_mode_lines == 0)
-      && (windows_or_buffers_changed == REDISPLAY_SOME
-         || windows_or_buffers_changed == 0)
+      && REDISPLAY_SOME_P ()
       && !w->redisplay
       && !f->redisplay
       && !buffer->text->redisplay)