[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
scratch/handler-bind e7c19f33112 09/12: (edebug-format): Make it obsolet
From: |
Stefan Monnier |
Subject: |
scratch/handler-bind e7c19f33112 09/12: (edebug-format): Make it obsolete |
Date: |
Mon, 25 Dec 2023 23:56:51 -0500 (EST) |
branch: scratch/handler-bind
commit e7c19f33112a480199053de983552d2c9a91b143
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
(edebug-format): Make it obsolete
* lisp/emacs-lisp/edebug.el (edebug-safe-eval, edebug-eval-expression):
Use `error-message-string`.
(edebug-format): Make it obsolete.
(edebug-trace-display): Adjust accordingly.
---
lisp/emacs-lisp/edebug.el | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 2a1851dee58..5c5ce3747d4 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -2273,7 +2273,7 @@ If the signal is handled, DATA is made available to the
handler.
See `condition-case'.
This is the error handler installed during Edebug.
-It should only be active while Edebug is. It checks `debug-on-error' to see
+It should be active only while Edebug is. It checks `debug-on-error' to see
whether it should call the debugger. When execution is resumed, the
error is propagated further."
(if (and (listp debug-on-error) (memq (car err) debug-on-error))
@@ -3687,9 +3687,7 @@ Return the result of the last expression."
;; If there is an error, a string is returned describing the error.
(condition-case edebug-err
(edebug-eval expr)
- (error (edebug-format "%s: %s" ;; could
- (get (car edebug-err) 'error-message)
- (car (cdr edebug-err))))))
+ (error (error-message-string edebug-err))))
;;; Printing
@@ -3733,7 +3731,7 @@ Return the result of the last expression."
;;; Read, Eval and Print
(defalias 'edebug-prin1-to-string #'cl-prin1-to-string)
-(defalias 'edebug-format #'format-message)
+(define-obsolete-function-alias 'edebug-format #'format-message "30.1")
(defalias 'edebug-message #'message)
(defun edebug-eval-expression (expr &optional pp)
@@ -3753,10 +3751,7 @@ this is the prefix key.)"
(condition-case err
(edebug-eval expr)
(error
- (setq errored
- (format "%s: %s"
- (get (car err) 'error-message)
- (car (cdr err)))))))))
+ (setq errored (error-message-string err)))))))
(result
(unless errored
(values--store-value value)
@@ -4338,7 +4333,7 @@ You must include newlines in FMT to break lines, but one
newline is appended."
(setq truncate-lines t)
(setq buf-window (selected-window))
(goto-char (point-max))
- (insert (apply #'edebug-format fmt args) "\n")
+ (insert (apply #'format-message fmt args) "\n")
;; Make it visible.
(vertical-motion (- 1 (window-height)))
(set-window-start buf-window (point))
- branch scratch/handler-bind created (now 933bc573c60), Stefan Monnier, 2023/12/25
- scratch/handler-bind 23479891db8 01/12: New special form `handler-bind`, Stefan Monnier, 2023/12/25
- scratch/handler-bind 7da237eb092 03/12: edebug.el: Use `handler-bind` instead of `signal-hook-function`, Stefan Monnier, 2023/12/25
- scratch/handler-bind 089c87c61db 02/12: (eval-expression): Fix bug#67196, Stefan Monnier, 2023/12/25
- scratch/handler-bind a97a2363e39 04/12: ert.el: Use `handler-bind` to record backtraces, Stefan Monnier, 2023/12/25
- scratch/handler-bind 8f090cd421d 05/12: tramp.el: Use `handler-bind` instead of `signal-hook-function`, Stefan Monnier, 2023/12/25
- scratch/handler-bind 2f6f38ddc79 07/12: Move batch backtrace code to `top_level_2`, Stefan Monnier, 2023/12/25
- scratch/handler-bind e7c19f33112 09/12: (edebug-format): Make it obsolete,
Stefan Monnier <=
- scratch/handler-bind 071ea552e6b 10/12: Add `redisplay-counter` to catched nested redisplays and abort outer one, Stefan Monnier, 2023/12/25
- scratch/handler-bind 68c95fc6682 06/12: startup.el: Use `handler-bind` to implement `--debug-init`, Stefan Monnier, 2023/12/25
- scratch/handler-bind 1fcb76b0465 08/12: Allow the `error-message` property to be a function, Stefan Monnier, 2023/12/25
- scratch/handler-bind 453f977d642 11/12: misc debug-early.el (incl. debug-early-muted), Stefan Monnier, 2023/12/25
- scratch/handler-bind 933bc573c60 12/12: (macroexp--with-extended-form-stack): Use plain `let`, Stefan Monnier, 2023/12/25