From c71e08eba94fc821616ab8d48847ff7130974d61 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 5 Feb 2021 13:06:07 +0200 Subject: [PATCH 1/4] Fix last change in syntax.texi * doc/lispref/syntax.texi (Syntax Properties): Fix wording in last change. (Bug#46274) --- doc/lispref/syntax.texi | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/lispref/syntax.texi b/doc/lispref/syntax.texi index 58f07c9644d..9adffcc18d3 100644 --- a/doc/lispref/syntax.texi +++ b/doc/lispref/syntax.texi @@ -573,10 +573,11 @@ and by Font Lock mode during syntactic fontification (@pxref{Syntactic Font Lock}). It is called with two arguments, @var{start} and @var{end}, which are the starting and ending positions of the text on which it should act. It is allowed to call @code{syntax-ppss} on any -position before @var{end}, but if it calls @code{syntax-ppss} on some -position and later modifies the buffer on some earlier position, -then it is its responsibility to call @code{syntax-ppss-flush-cache} -to flush the now obsolete info from the cache. +position before @var{end}, but if a Lisp program calls +@code{syntax-ppss} on some position and later modifies the buffer at +some earlier position, then it is that program's responsibility to +call @code{syntax-ppss-flush-cache} to flush the now obsolete info +from the cache. @strong{Caution:} When this variable is non-@code{nil}, Emacs removes @code{syntax-table} text properties arbitrarily and relies on From 6c5ddf0e0bc4e3e3ed819835f00419b7289d33c7 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Sat, 6 Feb 2021 09:28:40 +0100 Subject: [PATCH 2/4] Fix two small tab bar issues * lisp/cus-start.el (frame-inhibit-implied-resize): Update version tag. * lisp/frame.el (frame-inner-height): Do not count in tab bar. --- lisp/cus-start.el | 2 +- lisp/frame.el | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 4b7c3863063..b7f0d7e2a85 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -336,7 +336,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (const :tag "Never" nil) (const :tag "Always" t) (repeat (symbol :tag "Parameter"))) - "25.1") + "27.1") (iconify-child-frame frames (choice (const :tag "Do nothing" nil) diff --git a/lisp/frame.el b/lisp/frame.el index 7f1b8af9190..15e46c9e210 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -1344,6 +1344,7 @@ FRAME defaults to the selected frame." FRAME defaults to the selected frame." (setq frame (window-normalize-frame frame)) (- (frame-native-height frame) + (tab-bar-height frame t) (* 2 (frame-internal-border-width frame)))) (defun frame-outer-width (&optional frame) From 7a25ff767df7a323898a59531a1c518b1bc28699 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Sat, 6 Feb 2021 11:46:58 +0100 Subject: [PATCH 3/4] Clarify the indent-rigidly doc string * lisp/indent.el (indent-rigidly): Clarify exiting the transient mode (bug#46296). --- lisp/indent.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/indent.el b/lisp/indent.el index ea71e88b8b6..ed67e1c16f7 100644 --- a/lisp/indent.el +++ b/lisp/indent.el @@ -212,7 +212,8 @@ It is activated by calling `indent-rigidly' interactively.") If called interactively with no prefix argument, activate a transient mode in which the indentation can be adjusted interactively by typing \\\\[indent-rigidly-left], \\[indent-rigidly-right], \\[indent-rigidly-left-to-tab-stop], or \\[indent-rigidly-right-to-tab-stop]. -Typing any other key deactivates the transient mode. +Typing any other key deactivates the transient mode, and this key is then +acted upon as normally. If called from a program, or interactively with prefix ARG, indent all lines starting in the region forward by ARG columns. From 8ad48a0bdd0806fe3bfbabf00c845381d9107cb0 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 6 Feb 2021 14:31:51 +0200 Subject: [PATCH 4/4] Improve doc string of 'text-scale-adjust' * lisp/face-remap.el (text-scale-adjust): Clarify that "default face height" refers to the 'default' face. (Bug#25168) --- lisp/face-remap.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/face-remap.el b/lisp/face-remap.el index 49b01d02a3d..6c3f4082fdf 100644 --- a/lisp/face-remap.el +++ b/lisp/face-remap.el @@ -325,9 +325,9 @@ INC may be passed as a numeric prefix argument. The actual adjustment made depends on the final component of the key-binding used to invoke the command, with all modifiers removed: - +, = Increase the default face height by one step - - Decrease the default face height by one step - 0 Reset the default face height to the global default + +, = Increase the height of the default face by one step + - Decrease the height of the default face by one step + 0 Reset the height of the default face to the global default After adjusting, continue to read input events and further adjust the face height as long as the input event read