(custom-theme-set-faces): Make it handle face aliases whose alias

declarations are pre- or autoloaded.

1 files changed, 6 insertions, 0 deletions

diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index 054ad9acaa3..2a0198689de 100644
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -320,6 +320,10 @@ FACE's list property `theme-face' \(using `custom-push-theme')."
                   (spec (nth 1 entry))
                   (now (nth 2 entry))
                   (comment (nth 3 entry)))
+              ;; 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)
               (custom-push-theme 'theme-face face theme 'set spec)
@@ -334,6 +338,8 @@ FACE's list property `theme-face' \(using `custom-push-theme')."
         ;; Old format, a plist of FACE SPEC pairs.
         (let ((face (nth 0 args))
               (spec (nth 1 args)))
+          (if (get face 'face-alias)
+                  (setq face (get face 'face-alias)))
           (put face 'saved-face spec)
           (custom-push-theme 'theme-face face theme 'set spec))
         (setq args (cdr (cdr args))))))))