From 213bcaf1bf365d0d40639754b8123f9d770b08e8 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 25 Sep 2019 11:09:09 +0300 Subject: [PATCH] ; * lisp/emacs-lisp/debug.el (debugger-mode): Doc fix. (Bug#37352) --- lisp/emacs-lisp/debug.el | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el index 21499f75790..f711971c181 100644 --- a/lisp/emacs-lisp/debug.el +++ b/lisp/emacs-lisp/debug.el @@ -588,12 +588,15 @@ The environment used is the one when entering the activation frame at point." (define-derived-mode debugger-mode backtrace-mode "Debugger" "Mode for debugging Emacs Lisp using a backtrace. \\ -A line starts with `*' if exiting that frame will call the debugger. -Type \\[debugger-frame] or \\[debugger-frame-clear] to set or remove the `*'. - -When in debugger due to frame being exited, -use the \\[debugger-return-value] command to override the value -being returned from that frame. +A frame marked with `*' in the backtrace means that exiting that +frame will enter the debugger. You can flag frames to enter the +debugger when frame is exited with \\[debugger-frame], and remove +the flag with \\[debugger-frame-clear]. + +When in debugger invoked due to exiting a frame which was flagged +with a `*', you can use the \\[debugger-return-value] command to +override the value being returned from that frame when the debugger +exits. Use \\[debug-on-entry] and \\[cancel-debug-on-entry] to control which functions will enter the debugger when called. -- 2.39.2