aboutsummaryrefslogtreecommitdiffstats
path: root/src/xdisp.c
diff options
context:
space:
mode:
authorEli Zaretskii2013-03-31 15:36:07 +0300
committerEli Zaretskii2013-03-31 15:36:07 +0300
commit65d72c1bf862d339d72d760e7ac8ccbc4837f06b (patch)
tree3d902ee01eda40ee5975dc42277e2495cef2996c /src/xdisp.c
parentf1aa11971a74b7b2fa0f5baaaaf21dfbd388de6b (diff)
parent6ea3f01e74cbae9dc1366a07aea09d9665167981 (diff)
downloademacs-65d72c1bf862d339d72d760e7ac8ccbc4837f06b.tar.gz
emacs-65d72c1bf862d339d72d760e7ac8ccbc4837f06b.zip
Merge from trunk.
Diffstat (limited to 'src/xdisp.c')
-rw-r--r--src/xdisp.c2
1 files changed, 0 insertions, 2 deletions
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)
12948 12948
12949 unbind_to (count1, Qnil); 12949 unbind_to (count1, Qnil);
12950 12950
12951 FRAME_SCROLL_BOTTOM_VPOS (XFRAME (w->frame)) = -1;
12952
12953 consider_all_windows_p = (update_mode_lines 12951 consider_all_windows_p = (update_mode_lines
12954 || buffer_shared_and_changed () 12952 || buffer_shared_and_changed ()
12955 || cursor_type_changed); 12953 || cursor_type_changed);