diff options
Diffstat (limited to 'lisp/emacs-lisp/edebug.el')
| -rw-r--r-- | lisp/emacs-lisp/edebug.el | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 54325c87b6d..ebe375088a3 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -511,9 +511,16 @@ the minibuffer." (set-default (nth 1 form) (eval (nth 2 form)))) ((eq (car form) 'defface) ;; Reset the face. - (put (nth 1 form) 'face-defface-spec nil) (setq face-new-frame-defaults - (assq-delete-all (nth 1 form) face-new-frame-defaults)))) + (assq-delete-all (nth 1 form) face-new-frame-defaults)) + (put (nth 1 form) 'face-defface-spec nil) + ;; See comments in `eval-defun-1' for purpose of code below + (setq form (prog1 `(prog1 ,form + (put ',(nth 1 form) 'saved-face + ',(get (nth 1 form) 'saved-face)) + (put ',(nth 1 form) 'customized-face + ',(nth 2 form))) + (put (nth 1 form) 'saved-face nil))))) (setq edebug-result (eval form)) (if (not edebugging) (princ edebug-result) @@ -3323,7 +3330,7 @@ With prefix ARG, set temporary break at current point and go." (defun edebug-goto-here () - "Proceed to this stop point." + "Proceed to first stop-point at or after current position of point." (interactive) (edebug-go-mode t)) |