Merged in changes from CVS HEAD

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-118
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-119
   src/keyboard.c (adjust_point_for_property): #ifdef-out dodgy xassert

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-120
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-107

1 files changed, 9 insertions, 0 deletions

diff --git a/src/window.c b/src/window.c
index 8f971ab0260..7419239752a 100644
--- 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;
     }