diff options
| author | Stefan Kangas <stefan@marxist.se> | 2021-12-09 14:53:51 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2021-12-09 14:53:51 +0100 |
| commit | 6ecb24f877242371a0dbc7938e9b408df2690dc7 (patch) | |
| tree | ea0b2cc105dec7ec2be2eebff8f0a9115e78c213 /doc/lispref | |
| parent | 24e9616a0fefd1b3b60086eb6c88c15409ff42f7 (diff) | |
| parent | 1821844357e60eccbc269fb9455579061a6f30b2 (diff) | |
| download | emacs-6ecb24f877242371a0dbc7938e9b408df2690dc7.tar.gz | |
Merge from origin/emacs-28
1821844357 Add missing K key documentation for Cangjie input methods
be860c1385 Fix manual entry of 'quit-restore-window' (Bug#52328)
35a96139df Clarify a comment in xdisp.c
6ba2f028cf Revert "Grep alias `all' shall not match parent directory"
eb9e33e238 ; * etc/NEWS: Non-nil repeat-keep-prefix is not the defaul...
538fc1d0e0 Fix mode-line display in Calendar mode
# Conflicts:
# etc/NEWS
# lisp/help.el
Diffstat (limited to 'doc/lispref')
| -rw-r--r-- | doc/lispref/help.texi | 8 | ||||
| -rw-r--r-- | doc/lispref/windows.texi | 12 |
2 files changed, 12 insertions, 8 deletions
diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi index 71017a4d3db..e7b6406fd8c 100644 --- a/doc/lispref/help.texi +++ b/doc/lispref/help.texi @@ -379,11 +379,15 @@ quotes. You can customize it freely according to your personal preference. @end defopt -@defun substitute-command-keys string +@defun substitute-command-keys string &optional no-face +@vindex help-key-binding@r{ (face)} This function scans @var{string} for the above special sequences and replaces them by what they stand for, returning the result as a string. This permits display of documentation that refers accurately to the -user's own customized key bindings. +user's own customized key bindings. By default, the key bindings are +given a special face @code{help-key-binding}, but if the optional +argument @var{no-face} is non-@code{nil}, the function doesn't add +this face to the produced string. @cindex advertised binding If a command has multiple bindings, this function normally uses the diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index f8dcca72cc0..395b88ed92c 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -4306,12 +4306,12 @@ deleted unconditionally. Otherwise, the fate of the frame is determined by calling @code{frame-auto-hide-function} (see below) with that frame as sole argument. -If the third element of the @code{quit-restore} parameter is a list of -buffer, window start (@pxref{Window Start and End}), and point -(@pxref{Window Point}), and that buffer is still live, the buffer will -be displayed, and start and point set accordingly. If, in addition, -@var{window}'s buffer was temporarily resized, this function will also -try to restore the original height of @var{window}. +If the second element of the @code{quit-restore} parameter is a list +of a buffer, a window start (@pxref{Window Start and End}) and a +window point (@pxref{Window Point}), and that buffer is still live, +the buffer will be displayed, and start and point set accordingly. +If, in addition, @var{window}'s buffer was temporarily resized, this +function will also try to restore the original height of @var{window}. Otherwise, if @var{window} was previously used for displaying other buffers (@pxref{Window History}), the most recent buffer in that |