summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2026-05-30 07:43:08 -0400
committerEli Zaretskii <eliz@gnu.org>2026-05-30 07:43:08 -0400
commitd70c646894addec51b4948425b4a3779f761317f (patch)
treec46729da383bb4dfd752abf78a07ae9cd002a930 /doc
parenta2379402fc9d4aed342d85c171cbddea8be37862 (diff)
parent72d890c43e70477d496a9a0ef36a61357dde1023 (diff)
Merge from origin/emacs-31
72d890c43e7 ; Update the documentation of 'debug' 69fd4b87f4d Don't make buffer read-only when reverting if 'view-mode'... 2955b51e80c ; * etc/NEWS: Document the change in mode-line faces. # Conflicts: # etc/NEWS
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/debugging.texi8
1 files changed, 3 insertions, 5 deletions
diff --git a/doc/lispref/debugging.texi b/doc/lispref/debugging.texi
index 8d498608da4..48f3c3f8257 100644
--- a/doc/lispref/debugging.texi
+++ b/doc/lispref/debugging.texi
@@ -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