procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-28

Browse source 
3607508f3f Set calc-make-windows-dedicated to nil by default
9de8eec3bc * make-dist: Don't run "make --question info".  (Bug#52322)
cea8deea72 ; * src/xdisp.c (move_it_vertically_backward): Clarify com...
6170c5036e Fix regression in help-mode prompt

# Conflicts:
#	etc/NEWS
This commit is contained in:
Stefan Kangas 2021-12-14 06:31:37 +01:00
commit b8e6beaab0
5 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
etc/NEWS.28
View file

@ -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

2
lisp/calc/calc.el
View file

@ -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"

8
lisp/help-macro.el
View file

@ -167,14 +167,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 "<PageDown>"))
" or "
"/"
(help--key-description-fontified (kbd "<PageUp>"))
"/"
(help--key-description-fontified (kbd "SPC"))
"/"
(help--key-description-fontified (kbd "DEL"))
" to scroll"))))
char (aref key 0)))

7
make-dist
View file

@ -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])

11
src/xdisp.c
View file

@ -10423,11 +10423,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)