[Emacs-diffs] /srv/bzr/emacs/trunk r112612: Fix bug #14408 with updating *Messages* display.

[Eli Zaretskii]

------------------------------------------------------------
revno: 112612
fixes bug: http://debbugs.gnu.org/14408
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2013-05-16 21:33:27 +0300
message:
  Fix bug #14408 with updating *Messages* display.
  
   src/xdisp.c (message_dolog): If the *Messages* buffer is shown in
   some window, increment windows_or_buffers_changed, so that
   *Messages* display in that window is updated.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-05-16 12:48:54 +0000
+++ b/src/ChangeLog     2013-05-16 18:33:27 +0000
@@ -1,5 +1,9 @@
 2013-05-16  Eli Zaretskii  <address@hidden>
 
+       * xdisp.c (message_dolog): If the *Messages* buffer is shown in
+       some window, increment windows_or_buffers_changed, so that
+       *Messages* display in that window is updated.  (Bug#14408)
+
        * w32.c: Include epaths.h.
        (init_environment): Use cmdproxy.exe without leading directories.
        Support emacs.exe in src; point SHELL to cmdproxy in ../nt in that

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-05-08 17:59:38 +0000
+++ b/src/xdisp.c       2013-05-16 18:33:27 +0000
@@ -9537,7 +9537,15 @@
 
       shown = buffer_window_count (current_buffer) > 0;
       set_buffer_internal (oldbuf);
-      if (!shown)
+      /* We called insert_1_both above with its 5th argument (PREPARE)
+        zero, which prevents insert_1_both from calling
+        prepare_to_modify_buffer, which in turns prevents us from
+        incrementing windows_or_buffers_changed even if *Messages* is
+        shown in some window.  So we must manually incrementing
+        windows_or_buffers_changed here to make up for that.  */
+      if (shown)
+       windows_or_buffers_changed++;
+      else
        windows_or_buffers_changed = old_windows_or_buffers_changed;
       message_log_need_newline = !nlflag;
       Vdeactivate_mark = old_deactivate_mark;