summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Antipov <dmantipov@yandex.ru>2013-03-31 09:45:54 +0400
committerDmitry Antipov <dmantipov@yandex.ru>2013-03-31 09:45:54 +0400
commit9275998872e6932aee942f8805ac06220688c009 (patch)
tree3801728a0cddd93e492dd53be6bace848f83cf57
parent78b8f32044a91adcf8d60d937beae2184247a78c (diff)
downloademacs-9275998872e6932aee942f8805ac06220688c009.tar.gz
* 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.
-rw-r--r--src/ChangeLog7
-rw-r--r--src/frame.h5
-rw-r--r--src/xdisp.c2
3 files changed, 7 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b9e9cce5cb7..b2b4aa6895c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2013-03-31 Dmitry Antipov <dmantipov@yandex.ru>
+
+ * 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 <darren.hoo@gmail.com> (tiny change)
* nsmenu.m (showAtX:Y:for:): setLevel to
diff --git a/src/frame.h b/src/frame.h
index 32a6954024e..46e18dd8ddb 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -427,10 +427,6 @@ struct frame
/* 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 @@ typedef struct frame *FRAME_PTR;
#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,
diff --git a/src/xdisp.c b/src/xdisp.c
index 32c8224cf04..a7be5fc275c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -12948,8 +12948,6 @@ redisplay_internal (void)
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);