From 6170c5036e3802914723a288ef3191b58ef4a42d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 13 Dec 2021 15:51:38 +0200 Subject: [PATCH 1/4] Fix regression in help-mode prompt * lisp/help-macro.el (make-help-screen): Restore SPC and DEL in prompt. Reported by Colin Baxter . --- lisp/help-macro.el | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lisp/help-macro.el b/lisp/help-macro.el index 1fa9d82afd8..b3c7e2393a3 100644 --- a/lisp/help-macro.el +++ b/lisp/help-macro.el @@ -165,14 +165,18 @@ and then returns." (let ((cursor-in-echo-area t) (overriding-local-map local-map)) (setq key (read-key-sequence - (format "Type one of the options listed%s: " + (format "Type one of listed options%s: " (if (pos-visible-in-window-p (point-max)) "" (concat ", or " (help--key-description-fontified (kbd "")) - " or " + "/" (help--key-description-fontified (kbd "")) + "/" + (help--key-description-fontified (kbd "SPC")) + "/" + (help--key-description-fontified (kbd "DEL")) " to scroll")))) char (aref key 0))) From cea8deea7288efd15880dc035dccfb8d9866dff8 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 13 Dec 2021 21:02:38 +0200 Subject: [PATCH 2/4] ; * src/xdisp.c (move_it_vertically_backward): Clarify commentary. --- src/xdisp.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/xdisp.c b/src/xdisp.c index 5d687e1c291..597b12d4d68 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -10233,11 +10233,12 @@ move_it_to (struct it *it, ptrdiff_t to_charpos, int to_x, int to_y, int to_vpos /* Move iterator IT backward by a specified y-distance DY, DY >= 0. - If DY > 0, move IT backward at least that many pixels. DY = 0 - means move IT backward to the preceding line start or BEGV. This - function may move over more than DY pixels if IT->current_y - DY - ends up in the middle of a line; in this case IT->current_y will be - set to the top of the line moved to. */ + If DY > 0, move IT backward that many pixels. + DY = 0 means move IT backward to the preceding line start or to BEGV. + This function may move over less or more than DY pixels if + IT->current_y - DY ends up in the middle of a line; in this case + IT->current_y will be set to the top of the line either before or + after the exact pixel coordinate. */ void move_it_vertically_backward (struct it *it, int dy) From 9de8eec3bc9be2f6e7debf26159c1761c47df909 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Tue, 14 Dec 2021 03:08:37 +0100 Subject: [PATCH 3/4] * make-dist: Don't run "make --question info". (Bug#52322) --- make-dist | 7 ------- 1 file changed, 7 deletions(-) diff --git a/make-dist b/make-dist index b069130ca61..db7a74b82b3 100755 --- a/make-dist +++ b/make-dist @@ -299,13 +299,6 @@ if [ $check = yes ]; then echo "${bogosities}" fi - ## This exits with non-zero status if any .info files need - ## rebuilding. - if [ -r Makefile ] && [ "$with_info" = "yes" ]; then - echo "Checking to see if info files are up-to-date..." - make --question info || error=yes - fi - ## Is this a release? case $version in [1-9][0-9].[0-9]) From 3607508f3ffa3c32bc913a8be08f3d00bcde8027 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Tue, 14 Dec 2021 03:38:11 +0100 Subject: [PATCH 4/4] Set calc-make-windows-dedicated to nil by default * lisp/calc/calc.el (calc-make-windows-dedicated): Default to nil. (Bug#52016) --- etc/NEWS | 6 +++--- lisp/calc/calc.el | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index eb65213ac2f..d2565e50e1e 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1588,9 +1588,9 @@ and the result is not truncated in any way. It no longer has lower precedence than '+' and '-'. --- -*** Calc now marks its windows dedicated. -The new user option 'calc-make-windows-dedicated' controls this. It -is t by default; set to nil to get back the old behavior. +*** New user option 'calc-make-windows-dedicated'. +When this user option is non-nil, Calc will mark its windows as +dedicated. ** Calendar diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el index 553bdc9c6ed..e97315165b3 100644 --- a/lisp/calc/calc.el +++ b/lisp/calc/calc.el @@ -1423,7 +1423,7 @@ commands given here will actually operate on the *Calculator* stack." (require 'calc-ext) (calc-set-language calc-language calc-language-option t))) -(defcustom calc-make-windows-dedicated t +(defcustom calc-make-windows-dedicated nil "If non-nil, windows displaying Calc buffers will be marked dedicated. See `window-dedicated-p' for what that means." :version "28.1"