aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2018-07-01 19:19:51 +0300
committerEli Zaretskii2018-07-01 19:19:51 +0300
commitfd5bf49139ab84f630b60c6714e0db2da34edff2 (patch)
tree5e6d69901c0e964498787a549c438331caedc1e2
parent260768a64be39aada03247d6057698df97bcb800 (diff)
downloademacs-fd5bf49139ab84f630b60c6714e0db2da34edff2.tar.gz
emacs-fd5bf49139ab84f630b60c6714e0db2da34edff2.zip
Fix last change
* src/w32console.c (Fset_screen_color): Call Frecenter with 2 arguments. (Bug#31325) * etc/NEWS: * doc/lispref/windows.texi (Textual Scrolling): Clarify the role of the second argument to 'recenter'.
-rw-r--r--doc/lispref/windows.texi4
-rw-r--r--etc/NEWS7
-rw-r--r--src/w32console.c2
3 files changed, 8 insertions, 5 deletions
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 9740bbebf2c..ae6837b444f 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -4154,7 +4154,9 @@ If @var{count} is @code{nil} (or a non-@code{nil} list),
4154@code{recenter} puts the line containing point in the middle of the 4154@code{recenter} puts the line containing point in the middle of the
4155window. If @var{count} is @code{nil} and @var{redisplay} is 4155window. 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}. 4157value of @code{recenter-redisplay}. Thus, omitting the second
4158argument can be used to countermand the effect of
4159@code{recenter-redisplay} being non-@code{nil}.
4158 4160
4159When @code{recenter} is called interactively, @var{count} is the raw 4161When @code{recenter} is called interactively, @var{count} is the raw
4160prefix argument. Thus, typing @kbd{C-u} as the prefix sets the 4162prefix argument. Thus, typing @kbd{C-u} as the prefix sets the
diff --git a/etc/NEWS b/etc/NEWS
index d5f1abb5feb..3f761e9210b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -690,9 +690,10 @@ manual for more details.
690* Lisp Changes in Emacs 27.1 690* Lisp Changes in Emacs 27.1
691 691
692+++ 692+++
693** The function 'recenter' accepts an additional optional argument. 693** The function 'recenter' now accepts an additional optional argument.
694If the optional second argument is nil, recenter will not redisplay 694By default, calling 'recenter' will not redraw the frame even if
695the frame regardless of the value of 'recenter-redisplay'. 695'recenter-redisplay' is non-nil. Call 'recenter' with the new second
696argument non-nil to force redisplay per 'recenter-redisplay's value.
696 697
697+++ 698+++
698** New functions 'major-mode-suspend' and 'major-mode-restore'. 699** New functions 'major-mode-suspend' and 'major-mode-restore'.
diff --git a/src/w32console.c b/src/w32console.c
index ea30853bade..330aef57584 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -793,7 +793,7 @@ Arguments should be indices between 0 and 15, see w32console.el. */)
793{ 793{
794 char_attr_normal = XFASTINT (foreground) + (XFASTINT (background) << 4); 794 char_attr_normal = XFASTINT (foreground) + (XFASTINT (background) << 4);
795 795
796 Frecenter (Qnil); 796 Frecenter (Qnil, Qt);
797 return Qt; 797 return Qt;
798} 798}
799 799