[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115974: Fix bug #16347 with updating redisplay of c
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] trunk r115974: Fix bug #16347 with updating redisplay of company-mode's "tooltip". |
Date: |
Sat, 11 Jan 2014 11:55:17 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115974
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16347
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2014-01-11 13:54:08 +0200
message:
Fix bug #16347 with updating redisplay of company-mode's "tooltip".
src/xdisp.c (try_window_id): Don't use this function's optimizations
if overlays in the buffer displayed by the window have changed
since last redisplay.
(message_dolog): Fix indentation.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/xdisp.c xdisp.c-20091113204419-o5vbwnq5f7feedwu-240
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-01-11 10:01:01 +0000
+++ b/src/ChangeLog 2014-01-11 11:54:08 +0000
@@ -1,3 +1,10 @@
+2014-01-11 Eli Zaretskii <address@hidden>
+
+ * xdisp.c (try_window_id): Don't use this function's optimizations
+ if overlays in the buffer displayed by the window have changed
+ since last redisplay. (Bug#16347)
+ (message_dolog): Fix indentation.
+
2014-01-11 Martin Rudalics <address@hidden>
* frame.c (frame_resize_pixelwise): Fix doc-string.
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2014-01-11 11:28:57 +0000
+++ b/src/xdisp.c 2014-01-11 11:54:08 +0000
@@ -9854,7 +9854,7 @@
incrementing windows_or_buffers_changed even if *Messages* is
shown in some window. So we must manually set
windows_or_buffers_changed here to make up for that. */
- windows_or_buffers_changed = old_windows_or_buffers_changed;
+ windows_or_buffers_changed = old_windows_or_buffers_changed;
bset_redisplay (current_buffer);
set_buffer_internal (oldbuf);
@@ -17417,6 +17417,12 @@
if (windows_or_buffers_changed || f->cursor_type_changed)
GIVE_UP (2);
+ /* This function's optimizations cannot be used if overlays have
+ changed in the buffer displayed by the window, so give up if they
+ have. */
+ if (w->last_overlay_modified != OVERLAY_MODIFF)
+ GIVE_UP (21);
+
/* Verify that narrowing has not changed.
Also verify that we were not told to prevent redisplay optimizations.
It would be nice to further
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115974: Fix bug #16347 with updating redisplay of company-mode's "tooltip".,
Eli Zaretskii <=