[Emacs-diffs] trunk r113753: Do not reset window modification event counters excessively.

[Dmitry Antipov]

------------------------------------------------------------
revno: 113753
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Thu 2013-08-08 08:42:40 +0400
message:
  Do not reset window modification event counters excessively.
  These leftovers and poor man's tricky methods to catch extra
  redisplay's attention are no longer needed.
  * frame.c (set_menu_bar_lines_1):
  * minibuf.c (read_minibuf_unwind):
  * window.c (Fset_window_start, set_window_buffer, window_resize_apply)
  (grow_mini_window, shrink_mini_window, window_scroll_pixel_based)
  (window_scroll_line_based, Fset_window_configuration):
  * xdisp.c (redisplay_window): Do not reset last_modified and
  last_overlay_modified counters.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243
  src/minibuf.c                  minibuf.c-20091113204419-o5vbwnq5f7feedwu-242
  src/window.c                   window.c-20091113204419-o5vbwnq5f7feedwu-231
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-07 17:03:46 +0000
+++ b/src/ChangeLog     2013-08-08 04:42:40 +0000
@@ -1,3 +1,16 @@
+2013-08-08  Dmitry Antipov  <address@hidden>
+
+       Do not reset window modification event counters excessively.
+       These leftovers and poor man's tricky methods to catch extra
+       redisplay's attention are no longer needed.
+       * frame.c (set_menu_bar_lines_1):
+       * minibuf.c (read_minibuf_unwind):
+       * window.c (Fset_window_start, set_window_buffer, window_resize_apply)
+       (grow_mini_window, shrink_mini_window, window_scroll_pixel_based)
+       (window_scroll_line_based, Fset_window_configuration):
+       * xdisp.c (redisplay_window): Do not reset last_modified and
+       last_overlay_modified counters.
+
 2013-08-07  Jan Djärv  <address@hidden>
 
        * xselect.c (x_send_client_event): Set send_event and serial, memset

=== modified file 'src/frame.c'
--- a/src/frame.c       2013-08-05 18:05:46 +0000
+++ b/src/frame.c       2013-08-08 04:42:40 +0000
@@ -185,7 +185,6 @@
 {
   struct window *w = XWINDOW (window);
 
-  w->last_modified = 0;
   w->top_line += n;
   w->total_lines -= n;
 

=== modified file 'src/minibuf.c'
--- a/src/minibuf.c     2013-08-05 04:14:43 +0000
+++ b/src/minibuf.c     2013-08-08 04:42:40 +0000
@@ -870,10 +870,8 @@
   if (minibuf_level == 0)
     resize_mini_window (XWINDOW (window), 0);
 
-  /* Make sure minibuffer window is erased, not ignored.  */
+  /* Enforce full redisplay.  FIXME: make it more selective.  */
   windows_or_buffers_changed++;
-  XWINDOW (window)->last_modified = 0;
-  XWINDOW (window)->last_overlay_modified = 0;
 
   /* In case the previous minibuffer displayed in this miniwindow is
      dead, we may keep displaying this buffer (tho it's inactive), so reset it,

=== modified file 'src/window.c'
--- a/src/window.c      2013-08-07 13:21:59 +0000
+++ b/src/window.c      2013-08-08 04:42:40 +0000
@@ -1614,9 +1614,8 @@
   if (NILP (noforce))
     w->force_start = 1;
   w->update_mode_line = 1;
-  w->last_modified = 0;
-  w->last_overlay_modified = 0;
   if (!EQ (window, selected_window))
+    /* Enforce full redisplay.  FIXME: make it more selective.  */
     windows_or_buffers_changed++;
 
   return pos;
@@ -3215,8 +3214,6 @@
                             buffer);
       w->start_at_line_beg = 0;
       w->force_start = 0;
-      w->last_modified = 0;
-      w->last_overlay_modified = 0;
     }
   /* Maybe we could move this into the `if' but it's not obviously safe and
      I doubt it's worth the trouble.  */
@@ -3677,10 +3674,6 @@
          c = NILP (c->next) ? 0 : XWINDOW (c->next);
        }
     }
-
-  /* Clear out some redisplay caches.  */
-  w->last_modified = 0;
-  w->last_overlay_modified = 0;
 }
 
 
@@ -4199,9 +4192,7 @@
       /* Grow the mini-window.  */
       w->top_line = r->top_line + r->total_lines;
       w->total_lines -= XINT (value);
-      w->last_modified = 0;
-      w->last_overlay_modified = 0;
-
+      /* Enforce full redisplay.  FIXME: make it more selective.  */
       windows_or_buffers_changed++;
       adjust_glyphs (f);
       unblock_input ();
@@ -4235,10 +4226,7 @@
          /* Shrink the mini-window.  */
          w->top_line = r->top_line + r->total_lines;
          w->total_lines = 1;
-
-         w->last_modified = 0;
-         w->last_overlay_modified = 0;
-
+         /* Enforce full redisplay.  FIXME: make it more selective.  */
          windows_or_buffers_changed++;
          adjust_glyphs (f);
          unblock_input ();
@@ -4464,8 +4452,6 @@
                                         w->contents);
                  w->start_at_line_beg = 1;
                  w->update_mode_line = 1;
-                 w->last_modified = 0;
-                 w->last_overlay_modified = 0;
                  /* Set force_start so that redisplay_window will run the
                     window-scroll-functions.  */
                  w->force_start = 1;
@@ -4610,8 +4596,6 @@
       bytepos = marker_byte_position (w->start);
       w->start_at_line_beg = (pos == BEGV || FETCH_BYTE (bytepos - 1) == '\n');
       w->update_mode_line = 1;
-      w->last_modified = 0;
-      w->last_overlay_modified = 0;
       /* Set force_start so that redisplay_window will run the
         window-scroll-functions.  */
       w->force_start = 1;
@@ -4810,8 +4794,6 @@
       set_marker_restricted_both (w->start, w->contents, pos, pos_byte);
       w->start_at_line_beg = !NILP (bolp);
       w->update_mode_line = 1;
-      w->last_modified = 0;
-      w->last_overlay_modified = 0;
       /* Set force_start so that redisplay_window will run
         the window-scroll-functions.  */
       w->force_start = 1;
@@ -5743,9 +5725,6 @@
                }
            }
 
-         w->last_modified = 0;
-         w->last_overlay_modified = 0;
-
          if (BUFFERP (p->buffer) && BUFFER_LIVE_P (XBUFFER (p->buffer)))
            /* If saved buffer is alive, install it.  */
            {

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-08-07 15:14:23 +0000
+++ b/src/xdisp.c       2013-08-08 04:42:40 +0000
@@ -15555,8 +15555,6 @@
          startp = run_window_scroll_functions (window, startp);
        }
 
-      w->last_modified = 0;
-      w->last_overlay_modified = 0;
       if (CHARPOS (startp) < BEGV)
        SET_TEXT_POS (startp, BEGV, BEGV_BYTE);
       else if (CHARPOS (startp) > ZV)
@@ -15802,9 +15800,6 @@
 
  try_to_scroll:
 
-  w->last_modified = 0;
-  w->last_overlay_modified = 0;
-
   /* Redisplay the mode line.  Select the buffer properly for that.  */
   if (!update_mode_line)
     {