Merged in changes from CVS HEAD

[gnu-emacs] / src / window.c

diff --git a/src/window.c b/src/window.c
index 8f971ab0260a6a56dd1405701eed9e79cb71e389..7419239752ad29bc1e1297dfc8631c7a6b3ec4a4 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -2046,6 +2046,9 @@ window_loop (type, obj, mini, frames)
            if (EQ (w->buffer, obj))
              {
                mark_window_display_accurate (window, 0);
+               w->update_mode_line = Qt;
+               XBUFFER (obj)->prevent_redisplay_optimizations_p = 1;
+               ++update_mode_lines;
                best_window = window;
              }
            break;
@@ -3464,12 +3467,18 @@ displaying that buffer.  */)
   if (NILP (object))
     {
       windows_or_buffers_changed++;
+      update_mode_lines++;
       return Qt;
     }
 
   if (WINDOWP (object))
     {
+      struct window *w = XWINDOW (object);
       mark_window_display_accurate (object, 0);
+      w->update_mode_line = Qt;
+      if (BUFFERP (w->buffer))
+       XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1;
+      ++update_mode_lines;
       return Qt;
     }