diff options
Diffstat (limited to 'lisp/cus-face.el')
| -rw-r--r-- | lisp/cus-face.el | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/lisp/cus-face.el b/lisp/cus-face.el index 8a6e77f9805..ba8e21c8a4c 100644 --- a/lisp/cus-face.el +++ b/lisp/cus-face.el @@ -320,13 +320,18 @@ FACE's list property `theme-face' \(using `custom-push-theme')." (let ((face (nth 0 entry)) (spec (nth 1 entry)) (now (nth 2 entry)) - (comment (nth 3 entry))) + (comment (nth 3 entry)) + oldspec) ;; If FACE is actually an alias, customize the face it ;; is aliased to. (if (get face 'face-alias) (setq face (get face 'face-alias))) - (put face 'saved-face spec) - (put face 'saved-face-comment comment) + + (setq oldspec (get face 'theme-face)) + (when (not (and oldspec (eq 'user (caar oldspec)))) + (put face 'saved-face spec) + (put face 'saved-face-comment comment)) + (custom-push-theme 'theme-face face theme 'set spec) (when (or now immediate) (put face 'force-face (if now 'rogue 'immediate))) @@ -345,17 +350,20 @@ FACE's list property `theme-face' \(using `custom-push-theme')." (custom-push-theme 'theme-face face theme 'set spec)) (setq args (cdr (cdr args)))))))) +;; XEmacs compability function. In XEmacs, when you reset a Custom +;; Theme, you have to specify the theme to reset it to. We just apply +;; the next theme. ;;;###autoload (defun custom-theme-reset-faces (theme &rest args) "Reset the specs in THEME of some faces to their specs in other themes. Each of the arguments ARGS has this form: - (FACE FROM-THEME) + (FACE IGNORED) -This means reset FACE to its value in FROM-THEME." +This means reset FACE. The argument IGNORED is ignored." (custom-check-theme theme) (dolist (arg args) - (custom-push-theme 'theme-face (car arg) theme 'reset (cadr arg)))) + (custom-push-theme 'theme-face (car arg) theme 'reset))) ;;;###autoload (defun custom-reset-faces (&rest args) |