[Emacs-diffs] /srv/bzr/emacs/trunk r112198: * frame.h (struct frame): Drop scroll_bottom_vpos

[Dmitry Antipov]

------------------------------------------------------------
revno: 112198
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Sun 2013-03-31 09:45:54 +0400
message:
  * frame.h (struct frame): Drop scroll_bottom_vpos
  member becaue all real users are dead long ago.
  (FRAME_SCROLL_BOTTOM_VPOS): Remove.
  * xdisp.c (redisplay_internal): Adjust user.
modified:
  src/ChangeLog
  src/frame.h
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-03-30 16:57:02 +0000
+++ b/src/ChangeLog     2013-03-31 05:45:54 +0000
@@ -1,3 +1,10 @@
+2013-03-31  Dmitry Antipov  <address@hidden>
+
+       * frame.h (struct frame): Drop scroll_bottom_vpos
+       member becaue all real users are dead long ago.
+       (FRAME_SCROLL_BOTTOM_VPOS): Remove.
+       * xdisp.c (redisplay_internal): Adjust user.
+
 2013-03-30  Darren Ho  <address@hidden>  (tiny change)
 
        * nsmenu.m (showAtX:Y:for:): setLevel to

=== modified file 'src/frame.h'
--- a/src/frame.h       2013-03-22 12:41:34 +0000
+++ b/src/frame.h       2013-03-31 05:45:54 +0000
@@ -427,10 +427,6 @@
   /* Width of bar cursor (if we are using that) for blink-off state.  */
   int blink_off_cursor_width;
 
-  /* Nonnegative if current redisplay should not do scroll computation
-     for lines beyond a certain vpos.  This is the vpos.  */
-  int scroll_bottom_vpos;
-
   /* Configured width of the scroll bar, in pixels and in characters.
      config_scroll_bar_cols tracks config_scroll_bar_width if the
      latter is positive; a zero value in config_scroll_bar_width means
@@ -785,7 +781,6 @@
 #define FRAME_DELETE_COST(f) (f)->delete_line_cost
 #define FRAME_INSERTN_COST(f) (f)->insert_n_lines_cost
 #define FRAME_DELETEN_COST(f) (f)->delete_n_lines_cost
-#define FRAME_SCROLL_BOTTOM_VPOS(f) (f)->scroll_bottom_vpos
 #define FRAME_FOCUS_FRAME(f) f->focus_frame
 
 /* This frame slot says whether scroll bars are currently enabled for frame F,

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-03-29 15:50:21 +0000
+++ b/src/xdisp.c       2013-03-31 05:45:54 +0000
@@ -12948,8 +12948,6 @@
 
   unbind_to (count1, Qnil);
 
-  FRAME_SCROLL_BOTTOM_VPOS (XFRAME (w->frame)) = -1;
-
   consider_all_windows_p = (update_mode_lines
                            || buffer_shared_and_changed ()
                            || cursor_type_changed);