diff options
| author | Miles Bader <miles@gnu.org> | 2005-06-24 01:59:52 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-06-24 01:59:52 +0000 |
| commit | 3f0607e49476578a260289a51a84639b1885c161 (patch) | |
| tree | 076023228279f15587ea24a5a7f9adb499ee969c /lisp/emacs-lisp/edebug.el | |
| parent | 82cf95134905ffe09000888e86e88c9a400a4468 (diff) | |
| parent | ff71329437a5195b60799e019871181c916024ff (diff) | |
| download | emacs-3f0607e49476578a260289a51a84639b1885c161.tar.gz emacs-3f0607e49476578a260289a51a84639b1885c161.tar.bz2 emacs-3f0607e49476578a260289a51a84639b1885c161.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-65
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 425-445)
- Remove "-face" suffix from gnus faces
- Update from CVS
- Remove "-face" suffix from MH-E faces
- Remove "-face" suffix from cc-mode faces
- Remove "-face" suffix from eshell faces
- Remove "-face" suffix from ediff faces
- Implement tty vertical-divider face
- Rename vertical-divider face to vertical-border
- Change escape-glyph color on dark backgrounds back to cyan
- Update reference to renamed Buffer-menu-buffer face
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)) |