andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-31

Browse source 
72d890c43e ; Update the documentation of 'debug'
69fd4b87f4 Don't make buffer read-only when reverting if 'view-mode'...
2955b51e80 ; * etc/NEWS: Document the change in mode-line faces.

# Conflicts:
#	etc/NEWS
This commit is contained in:
Eli Zaretskii 2026-05-30 07:43:08 -04:00
commit d70c646894
3 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/lispref/debugging.texi
View file

@ -638,11 +638,9 @@ debugger, etc.), and fills it with information about the stack of Lisp
function calls. It then enters a recursive edit, showing the
backtrace buffer in Debugger mode. In batch mode (more generally,
when @code{noninteractive} is non-@code{nil}, @pxref{Batch Mode}),
this function shows the Lisp backtrace on the standard error stream,
and then kills Emacs, causing it to exit with a non-zero exit code
(@pxref{Killing Emacs}). Binding
@code{backtrace-on-error-noninteractive} to @code{nil} suppresses the
backtrace in batch mode, see below.
this function shows the Lisp backtrace on the standard error stream.
Binding @code{backtrace-on-error-noninteractive} to @code{nil}
suppresses the backtrace in batch mode, see below.
The Debugger mode @kbd{c}, @kbd{d}, @kbd{j}, and @kbd{r} commands exit
the recursive edit; then @code{debug} switches back to the previous

13
etc/NEWS.31
View file

@ -572,6 +572,14 @@ ID. When called interactively, both functions prompt for an ID.
** Mode Line
---
*** New definitions for mode-line faces under dark background mode.
The faces 'mode-line' and 'mode-line-highlight' now have separate
definitions for the dark background mode. Previously, these two faces
looked the same in both the light and dark background modes. To get the
previous visuals for these two faces, customize them to have the colors
"grey75" and "grey40", respectively, regardless of the background mode.
+++
*** New user option 'mode-line-collapse-minor-modes'.
If non-nil, minor mode lighters on the mode line are collapsed into a
@ -4214,6 +4222,11 @@ suggestions. So the 'M-?' command now works without a tags table. And
the 'M-.' will show a message describing the several built-in options
that will provide an Xref backend when used.
+++
** Calling 'debug' in batch sessions no longer kills Emacs.
If you want Emacs to exit, your program will now have to call
'kill-emacs' explicitly.
* Lisp Changes in Emacs 31.1

4
lisp/view.el
View file

@ -464,6 +464,10 @@ Entry to view-mode runs the normal hook `view-mode-hook'."
;; so that View mode stays off if read-only-mode is called.
(if (local-variable-p 'view-read-only)
(kill-local-variable 'view-read-only))
;; Reset the read-only state memory as well, so that 'revert-buffer'
;; won't make the buffer read-only again.
(if (local-variable-p 'read-only-mode--state)
(setq-local read-only-mode--state nil))
(if buffer-read-only
(setq buffer-read-only view-old-buffer-read-only)))