Merge from trunk.

1 files changed, 11 insertions, 13 deletions

diff --git a/src/buffer.c b/src/buffer.c
index 61b685ea5c5..e4a550fed95 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1336,10 +1336,16 @@ header lines.  This function also forces recomputation of the
 menu bar menus and the frame title.  */)
      (Lisp_Object all)
 {
-  if (!NILP (all) || buffer_window_count (current_buffer))
+  if (!NILP (all))
     {
       update_mode_lines = 10;
-      current_buffer->prevent_redisplay_optimizations_p = 1;
+      /* FIXME: This can't be right.  */
+      current_buffer->prevent_redisplay_optimizations_p = true;
+    }
+  else if (buffer_window_count (current_buffer))
+    {
+      bset_update_mode_line (current_buffer);
+      current_buffer->prevent_redisplay_optimizations_p = true;
     }
   return all;
 }
@@ -2476,6 +2482,8 @@ current buffer is cleared.  */)
   if (narrowed)
     error ("Changing multibyteness in a narrowed buffer");
 
+  invalidate_buffer_caches (current_buffer, BEGV, ZV);
+
   if (NILP (flag))
     {
       ptrdiff_t pos, stop;
@@ -3895,17 +3903,7 @@ modify_overlay (struct buffer *buf, ptrdiff_t start, ptrdiff_t end)
 
   BUF_COMPUTE_UNCHANGED (buf, start, end);
 
-  /* If BUF is visible, consider updating the display if ...  */
-  if (buffer_window_count (buf) > 0)
-    {
-      /* ... it's visible in other window than selected,  */
-      if (buf != XBUFFER (XWINDOW (selected_window)->contents))
-        windows_or_buffers_changed = 11;
-      /* ... or if we modify an overlay at the end of the buffer
-         and so we cannot be sure that window end is still valid.  */
-      else if (end >= ZV && start <= ZV)
-        windows_or_buffers_changed = 12;
-    }
+  bset_redisplay (buf);
 
   ++BUF_OVERLAY_MODIFF (buf);
 }