aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Shahid2018-07-01 14:48:24 -0400
committerEli Zaretskii2018-07-07 12:07:47 +0300
commitea2f96837d00f5475cd48fc7bf62c19d1045c055 (patch)
tree616269023e3a2a19b92e1adfe6fdff14bbbb341c
parent42c0b8f3f27c8700f1f432649f2466aab9127061 (diff)
downloademacs-ea2f96837d00f5475cd48fc7bf62c19d1045c055.tar.gz
emacs-ea2f96837d00f5475cd48fc7bf62c19d1045c055.zip
Keep interactive uses of 'recenter' backward compatible (Bug#31325)
* window.c (Frecenter): Change the interactive spec to always pass a non-nil value to the REDISPLAY argument when called interactively. * window.el (recenter-top-bottom): Make sure 'recenter's second argument is non-nil everywhere. * windows.texi (Textual Scrolling): Update documentation of 'recenter'.
-rw-r--r--doc/lispref/windows.texi3
-rw-r--r--lisp/window.el2
-rw-r--r--src/window.c4
3 files changed, 5 insertions, 4 deletions
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index ae6837b444f..3eaa15a6036 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -4156,7 +4156,8 @@ window. If @var{count} is @code{nil} and @var{redisplay} is
4156non-@code{nil}, this function may redraw the frame, according to the 4156non-@code{nil}, this function may redraw the frame, according to the
4157value of @code{recenter-redisplay}. Thus, omitting the second 4157value of @code{recenter-redisplay}. Thus, omitting the second
4158argument can be used to countermand the effect of 4158argument can be used to countermand the effect of
4159@code{recenter-redisplay} being non-@code{nil}. 4159@code{recenter-redisplay} being non-@code{nil}. Interactive calls
4160pass non-‘nil’ for @var{redisplay}.
4160 4161
4161When @code{recenter} is called interactively, @var{count} is the raw 4162When @code{recenter} is called interactively, @var{count} is the raw
4162prefix argument. Thus, typing @kbd{C-u} as the prefix sets the 4163prefix argument. Thus, typing @kbd{C-u} as the prefix sets the
diff --git a/lisp/window.el b/lisp/window.el
index 6d9d8bdcd2e..d56bed63da0 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -8767,7 +8767,7 @@ A prefix argument is handled like `recenter':
8767 With plain `C-u', move current line to window center." 8767 With plain `C-u', move current line to window center."
8768 (interactive "P") 8768 (interactive "P")
8769 (cond 8769 (cond
8770 (arg (recenter arg)) ; Always respect ARG. 8770 (arg (recenter arg t)) ; Always respect ARG.
8771 (t 8771 (t
8772 (setq recenter-last-op 8772 (setq recenter-last-op
8773 (if (eq this-command last-command) 8773 (if (eq this-command last-command)
diff --git a/src/window.c b/src/window.c
index d3c72570dd1..422b06a49fe 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5901,7 +5901,7 @@ displayed_window_lines (struct window *w)
5901} 5901}
5902 5902
5903 5903
5904DEFUN ("recenter", Frecenter, Srecenter, 0, 2, "P", 5904DEFUN ("recenter", Frecenter, Srecenter, 0, 2, "P\np",
5905 doc: /* Center point in selected window and maybe redisplay frame. 5905 doc: /* Center point in selected window and maybe redisplay frame.
5906With a numeric prefix argument ARG, recenter putting point on screen line ARG 5906With a numeric prefix argument ARG, recenter putting point on screen line ARG
5907relative to the selected window. If ARG is negative, it counts up from the 5907relative to the selected window. If ARG is negative, it counts up from the
@@ -5913,7 +5913,7 @@ non-nil, also erase the entire frame and redraw it (when
5913`auto-resize-tool-bars' is set to `grow-only', this resets the 5913`auto-resize-tool-bars' is set to `grow-only', this resets the
5914tool-bar's height to the minimum height needed); if 5914tool-bar's height to the minimum height needed); if
5915`recenter-redisplay' has the special value `tty', then only tty frames 5915`recenter-redisplay' has the special value `tty', then only tty frames
5916are redrawn. 5916are redrawn. Interactively, REDISPLAY is always non-nil.
5917 5917
5918Just C-u as prefix means put point in the center of the window 5918Just C-u as prefix means put point in the center of the window
5919and redisplay normally--don't erase and redraw the frame. */) 5919and redisplay normally--don't erase and redraw the frame. */)