Re: Latest changes in redisplay code

[Dmitry Antipov <dmantipov@yandex.ru>]

[-- Attachment #1: Type: text/plain, Size: 1212 bytes --]

On 02/06/2013 10:08 PM, Eli Zaretskii wrote:

>> Date: Wed, 06 Feb 2013 11:37:30 +0400
>> From: Dmitry Antipov <dmantipov@yandex.ru>
>> CC: emacs-devel@gnu.org
>>
>> On 02/05/2013 10:01 PM, Eli Zaretskii wrote:
>>
>>> In any case, the potential for problems is still there, because now
>>> w->base_line_pos gets reset to zero in many more places than it was
>>> before.  Previously, only xdisp.c would manipulate this attribute in a
>>> few well-defined places.  Now it can be reset by any function that
>>> calls adjust_window_count, including wset_buffer, which is called from
>>> many primitives, most of them outside xdisp.c.  Therefore, it's quite
>>> possible that we will now have to count from the beginning of the
>>> buffer much more frequently than we did before.  In large buffers,
>>> this could be quite a hit.
>>
>> Hm. I'll try to reproduce such a situation and check what happens.
>> Maybe we should invalidate window_end_valid and base_line_pos only
>> if either window is really switched to another buffer or buffer
>> is changed.
>
> That'd be hard, because there are many places that switch to another
> buffer temporarily, and they all call adjust_window_count.

What about this?

Dmitry



[-- Attachment #2: wset_buffer.patch --]
[-- Type: text/plain, Size: 1850 bytes --]

=== modified file 'src/window.c'
--- src/window.c	2013-02-01 07:23:18 +0000
+++ src/window.c	2013-02-07 05:31:20 +0000
@@ -269,9 +269,10 @@
 }
 
 /* Called when W's buffer slot is changed.  ARG -1 means that W is about to
-   cease its buffer, and 1 means that W is about to set up the new one.  */
+   cease its buffer, and 1 means that W is about to set up the new one.
+   Return W's buffer if it's a buffer or NULL otherwise.  */
 
-static void
+static struct buffer *
 adjust_window_count (struct window *w, int arg)
 {
   eassert (eabs (arg) == 1);
@@ -283,21 +284,34 @@
 	b = b->base_buffer;
       b->window_count += arg;
       eassert (b->window_count >= 0);
-      /* These should be recalculated by redisplay code.  */
-      w->window_end_valid = 0;
-      w->base_line_pos = 0;
+      return b;
     }
+  return NULL;
 }
 
-/* Set W's buffer slot to VAL and recompute number
-   of windows showing VAL if it is a buffer.  */
+/* Set W's buffer slot to VAL and recompute number of windows showing
+   VAL if it is a buffer, catch some redisplay's attention if needed.  */
 
 void
 wset_buffer (struct window *w, Lisp_Object val)
 {
-  adjust_window_count (w, -1);
+  struct buffer *oldb, *newb;
+
+  oldb = adjust_window_count (w, -1);
   w->buffer = val;
-  adjust_window_count (w, 1);
+  newb = adjust_window_count (w, 1);
+  if ((oldb && oldb == newb
+       && ((BUF_UNCHANGED_MODIFIED (oldb) < BUF_MODIFF (oldb))
+	   || (BUF_OVERLAY_UNCHANGED_MODIFIED (oldb)
+	       < BUF_OVERLAY_MODIFF (oldb))))
+      || (!oldb && newb))
+    {
+      /* If W's buffer was changed since last redisplay or W
+	 is switched to another buffer from no buffer, next
+	 redisplay should recalculate these fields.  */
+      w->window_end_valid = 0;
+      w->base_line_pos = 0;
+    }
 }
 
 /* Build a frequently used 4-integer (X Y W H) list.  */