Commit 02013850 authored by Eli Zaretskii's avatar Eli Zaretskii

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.
parent dc604697
2014-01-11 Eli Zaretskii <eliz@gnu.org>
* 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 <rudalics@gmx.at> 2014-01-11 Martin Rudalics <rudalics@gmx.at>
* frame.c (frame_resize_pixelwise): Fix doc-string. * frame.c (frame_resize_pixelwise): Fix doc-string.
......
...@@ -9854,7 +9854,7 @@ message_dolog (const char *m, ptrdiff_t nbytes, bool nlflag, bool multibyte) ...@@ -9854,7 +9854,7 @@ message_dolog (const char *m, ptrdiff_t nbytes, bool nlflag, bool multibyte)
incrementing windows_or_buffers_changed even if *Messages* is incrementing windows_or_buffers_changed even if *Messages* is
shown in some window. So we must manually set shown in some window. So we must manually set
windows_or_buffers_changed here to make up for that. */ 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); bset_redisplay (current_buffer);
set_buffer_internal (oldbuf); set_buffer_internal (oldbuf);
...@@ -17417,6 +17417,12 @@ try_window_id (struct window *w) ...@@ -17417,6 +17417,12 @@ try_window_id (struct window *w)
if (windows_or_buffers_changed || f->cursor_type_changed) if (windows_or_buffers_changed || f->cursor_type_changed)
GIVE_UP (2); 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. /* Verify that narrowing has not changed.
Also verify that we were not told to prevent redisplay optimizations. Also verify that we were not told to prevent redisplay optimizations.
It would be nice to further It would be nice to further
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment