diff options
| author | Bill Wohler <wohler@newt.com> | 2012-11-25 10:33:16 -0800 |
|---|---|---|
| committer | Bill Wohler <wohler@newt.com> | 2012-11-25 10:33:16 -0800 |
| commit | a09777fb290dfd273a66a845e75b208f23262f06 (patch) | |
| tree | ff5bdf05f86b1e451673f7e7db65a1304419335e /lisp/emacs-lisp | |
| parent | 77f9b93eb2ff2e2d62cdb6bde2f9476b2420bf24 (diff) | |
| parent | d0457b578da02c7873b15ef4bfaf5607f5db7c5c (diff) | |
| download | emacs-a09777fb290dfd273a66a845e75b208f23262f06.tar.gz emacs-a09777fb290dfd273a66a845e75b208f23262f06.tar.bz2 emacs-a09777fb290dfd273a66a845e75b208f23262f06.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 64aac4b81db..bc61a24d9dc 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -847,21 +847,8 @@ Reinitialize the face according to the `defface' specification." (setq face-new-frame-defaults (assq-delete-all face-symbol face-new-frame-defaults)) (put face-symbol 'face-defface-spec nil) - (put face-symbol 'face-documentation (nth 3 form)) - ;; Setting `customized-face' to the new spec after calling - ;; the form, but preserving the old saved spec in `saved-face', - ;; imitates the situation when the new face spec is set - ;; temporarily for the current session in the customize - ;; buffer, thus allowing `face-user-default-spec' to use the - ;; new customized spec instead of the saved spec. - ;; Resetting `saved-face' temporarily to nil is needed to let - ;; `defface' change the spec, regardless of a saved spec. - (prog1 `(prog1 ,form - (put ,(nth 1 form) 'saved-face - ',(get face-symbol 'saved-face)) - (put ,(nth 1 form) 'customized-face - ,(nth 2 form))) - (put face-symbol 'saved-face nil)))) + (put face-symbol 'face-override-spec nil)) + form) ((eq (car form) 'progn) (cons 'progn (mapcar 'eval-defun-1 (cdr form)))) (t form))) |