aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Antipov2013-01-24 07:34:20 +0400
committerDmitry Antipov2013-01-24 07:34:20 +0400
commit5ad86e34d86173f6495b38336d377de5b69da853 (patch)
tree2210327e1d4ad35a910bf30b7fb49ec3b8ea0e12
parente02703bda99855408580c2effaf1dd36911aa8df (diff)
downloademacs-5ad86e34d86173f6495b38336d377de5b69da853.tar.gz
emacs-5ad86e34d86173f6495b38336d377de5b69da853.zip
* src/insdel.c (prepare_to_modify_buffer): Revert last change as suggested
in http://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00555.html. * lisp/doc-view.el (doc-view-display): Force mode line update until all document is converted. Suggested by Stefan Monnier (Bug#13164).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/doc-view.el2
-rw-r--r--src/ChangeLog5
-rw-r--r--src/insdel.c7
4 files changed, 14 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d783443f528..afab39e6efc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-01-24 Dmitry Antipov <dmantipov@yandex.ru>
2
3 * doc-view.el (doc-view-display): Force mode line update until all
4 document is converted. Suggested by Stefan Monnier (Bug#13164).
5
12013-01-23 Bastien Guerry <bzg@gnu.org> 62013-01-23 Bastien Guerry <bzg@gnu.org>
2 7
3 * paren.el (show-paren-function): Make sure an overlay exists 8 * paren.el (show-paren-function): Make sure an overlay exists
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index fa54eef828d..30aa3a09bf2 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -1265,6 +1265,8 @@ have the page we want to view."
1265 "[0-9]+") 1265 "[0-9]+")
1266 t) 1266 t)
1267 'doc-view-sort)) 1267 'doc-view-sort))
1268 (unless (eq (length prev-pages) (length doc-view-current-files))
1269 (force-mode-line-update))
1268 (dolist (win (or (get-buffer-window-list buffer nil t) 1270 (dolist (win (or (get-buffer-window-list buffer nil t)
1269 (list t))) 1271 (list t)))
1270 (let* ((page (doc-view-current-page win)) 1272 (let* ((page (doc-view-current-page win))
diff --git a/src/ChangeLog b/src/ChangeLog
index 7a2ff184c0a..0ee2dbfd53f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-01-24 Dmitry Antipov <dmantipov@yandex.ru>
2
3 * insdel.c (prepare_to_modify_buffer): Revert last change as suggested
4 in http://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00555.html.
5
12013-01-23 Stefan Monnier <monnier@iro.umontreal.ca> 62013-01-23 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * xdisp.c (message2, message2_nolog): Remove functions. 8 * xdisp.c (message2, message2_nolog): Remove functions.
diff --git a/src/insdel.c b/src/insdel.c
index 98dd97bdd08..303247816ca 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -1804,12 +1804,9 @@ prepare_to_modify_buffer (ptrdiff_t start, ptrdiff_t end,
1804 Fbarf_if_buffer_read_only (); 1804 Fbarf_if_buffer_read_only ();
1805 1805
1806 /* If we're modifying the buffer other than shown in a selected window, 1806 /* If we're modifying the buffer other than shown in a selected window,
1807 let redisplay consider other windows if this buffer is visible or 1807 let redisplay consider other windows if this buffer is visible. */
1808 hidden (although hidden buffers have zero window counts, their state
1809 may affect the display too, e.g. via mode lines of other buffers). */
1810 if (XBUFFER (XWINDOW (selected_window)->buffer) != current_buffer 1808 if (XBUFFER (XWINDOW (selected_window)->buffer) != current_buffer
1811 && (buffer_window_count (current_buffer) 1809 && buffer_window_count (current_buffer))
1812 || BUFFER_HIDDEN_P (current_buffer)))
1813 ++windows_or_buffers_changed; 1810 ++windows_or_buffers_changed;
1814 1811
1815 if (buffer_intervals (current_buffer)) 1812 if (buffer_intervals (current_buffer))