diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-06-22 17:53:21 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-06-22 17:53:21 +0000 |
| commit | f4d9bf3a9be50a17c2e2f7569b88f3606ab273d9 (patch) | |
| tree | a06250d0c5fec729ab16920d2bb4f857f04cde8b /lisp/emacs-lisp/edebug.el | |
| parent | f3479ceeb65724094be33b49bae289a81f42b6ee (diff) | |
| parent | 73106994f86353b8bb5018bacdace22643c5f485 (diff) | |
| download | emacs-f4d9bf3a9be50a17c2e2f7569b88f3606ab273d9.tar.gz emacs-f4d9bf3a9be50a17c2e2f7569b88f3606ab273d9.tar.bz2 emacs-f4d9bf3a9be50a17c2e2f7569b88f3606ab273d9.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 438-440)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-438
Rename vertical-divider face to vertical-border
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-439
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-440
Change escape-glyph color on dark backgrounds back to cyan
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-353
Diffstat (limited to 'lisp/emacs-lisp/edebug.el')
| -rw-r--r-- | lisp/emacs-lisp/edebug.el | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index e9c767961cd..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) |