diff options
Diffstat (limited to 'lisp/emacs-lisp/debug.el')
| -rw-r--r-- | lisp/emacs-lisp/debug.el | 47 |
1 files changed, 26 insertions, 21 deletions
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el index 069c7a90ad0..163528acf6f 100644 --- a/lisp/emacs-lisp/debug.el +++ b/lisp/emacs-lisp/debug.el @@ -119,7 +119,7 @@ This is to optimize `debugger-make-xrefs'.") (defvar debugger-jumping-flag nil "Non-nil means that `debug-on-entry' is disabled. This variable is used by `debugger-jump', `debugger-step-through', -and `debugger-reenable' to temporarily disable debug-on-entry.") +and `debugger-reenable' to temporarily disable `debug-on-entry'.") (defvar inhibit-trace) ;Not yet implemented. @@ -128,7 +128,7 @@ and `debugger-reenable' to temporarily disable debug-on-entry.") It is a list expected to take the form (CAUSE . REST) where CAUSE can be: - debug: called for entry to a flagged function. -- t: called because of debug-on-next-call. +- t: called because of `debug-on-next-call'. - lambda: same thing but via `funcall'. - exit: called because of exit of a flagged function. - error: called because of `debug-on-error'.") @@ -182,7 +182,11 @@ the debugger will not be entered." (equal "initial_terminal" (terminal-name))))) ;; Don't let `inhibit-message' get in our way (especially important if ;; `non-interactive-frame' evaluated to a non-nil value. - (inhibit-message nil)) + (inhibit-message nil) + ;; We may be entering the debugger from a context that has + ;; let-bound `inhibit-read-only', which means that all + ;; buffers would be read/write while the debugger is running. + (inhibit-read-only nil)) (unless non-interactive-frame (message "Entering debugger...")) (let (debugger-value @@ -262,16 +266,15 @@ the debugger will not be entered." (window-frame debugger-previous-window))) `((previous-window . ,debugger-previous-window)))))) (setq debugger-window (selected-window)) - (if (eq debugger-previous-window debugger-window) - (when debugger-jumping-flag - ;; Try to restore previous height of debugger - ;; window. - (condition-case nil - (window-resize - debugger-window - (- debugger-previous-window-height - (window-total-height debugger-window))) - (error nil))) + (when debugger-jumping-flag + ;; Try to restore previous height of debugger + ;; window. + (condition-case nil + (window-resize + debugger-window + (- debugger-previous-window-height + (window-total-height debugger-window))) + (error nil)) (setq debugger-previous-window debugger-window)) (message "") (let ((standard-output nil) @@ -332,7 +335,7 @@ Make functions into cross-reference buttons if DO-XREFS is non-nil." (defun debugger-setup-buffer (args) "Initialize the `*Backtrace*' buffer for entry to the debugger. -That buffer should be current already and in debugger-mode." +That buffer should be current already and in `debugger-mode'." (setq backtrace-frames (nthcdr ;; Remove debug--implement-debug-on-entry and the ;; advice's `apply' frame. @@ -387,7 +390,7 @@ Include the reason for debugger entry from ARGS." (`(set ,buffer) (format "setting %s in buffer %s to %s" symbol buffer (backtrace-print-to-string newval))) - (_ (error "unrecognized watchpoint triggered %S" (cdr args)))) + (_ (error "Unrecognized watchpoint triggered %S" (cdr args)))) ": ") (insert ?\n)) ;; Debugger entered for an error. @@ -451,7 +454,7 @@ will be used, such as in a debug on exit from a frame." (exit-recursive-edit)) (defun debugger-jump () - "Continue to exit from this frame, with all debug-on-entry suspended." + "Continue to exit from this frame, with all `debug-on-entry' suspended." (interactive) (debugger-frame) (setq debugger-jumping-flag t) @@ -461,7 +464,7 @@ will be used, such as in a debug on exit from a frame." (exit-recursive-edit)) (defun debugger-reenable () - "Turn all debug-on-entry functions back on. + "Turn all `debug-on-entry' functions back on. This function is put on `post-command-hook' by `debugger-jump' and removes itself from that hook." (setq debugger-jumping-flag nil) @@ -692,13 +695,14 @@ Redefining FUNCTION also cancels it." ;;;###autoload (defun cancel-debug-on-entry (&optional function) "Undo effect of \\[debug-on-entry] on FUNCTION. -If FUNCTION is nil, cancel debug-on-entry for all functions. +If FUNCTION is nil, cancel `debug-on-entry' for all functions. When called interactively, prompt for FUNCTION in the minibuffer. To specify a nil argument interactively, exit with an empty minibuffer." (interactive (list (let ((name (completing-read - "Cancel debug on entry to function (default all functions): " + (format-prompt "Cancel debug on entry to function" + "all functions") (mapcar #'symbol-name (debug--function-list)) nil t))) (when name (unless (string= name "") @@ -795,13 +799,14 @@ another symbol also cancels it." ;;;###autoload (defun cancel-debug-on-variable-change (&optional variable) "Undo effect of \\[debug-on-variable-change] on VARIABLE. -If VARIABLE is nil, cancel debug-on-variable-change for all variables. +If VARIABLE is nil, cancel `debug-on-variable-change' for all variables. When called interactively, prompt for VARIABLE in the minibuffer. To specify a nil argument interactively, exit with an empty minibuffer." (interactive (list (let ((name (completing-read - "Cancel debug on set for variable (default all variables): " + (format-prompt "Cancel debug on set for variable" + "all variables") (mapcar #'symbol-name (debug--variable-list)) nil t))) (when name (unless (string= name "") |