aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/cus-face.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index 92274dcbe21..dfc5babec84 100644
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -46,7 +46,7 @@
46 (make-empty-face face) 46 (make-empty-face face)
47 ;; Create frame-local faces 47 ;; Create frame-local faces
48 (dolist (frame (frame-list)) 48 (dolist (frame (frame-list))
49 (face-spec-set face value frame) 49 (face-spec-set-2 face frame value)
50 (when (memq (window-system frame) '(x w32 mac)) 50 (when (memq (window-system frame) '(x w32 mac))
51 (setq have-window-system t))) 51 (setq have-window-system t)))
52 ;; When making a face after frames already exist 52 ;; When making a face after frames already exist
@@ -342,7 +342,8 @@ FACE's list property `theme-face' \(using `custom-push-theme')."
342 (unless (facep face) 342 (unless (facep face)
343 (make-empty-face face)) 343 (make-empty-face face))
344 (put face 'face-comment comment) 344 (put face 'face-comment comment)
345 (face-spec-set face spec nil)) 345 (put face 'face-override-spec nil)
346 (face-spec-set face spec t))
346 (setq args (cdr args))) 347 (setq args (cdr args)))
347 ;; Old format, a plist of FACE SPEC pairs. 348 ;; Old format, a plist of FACE SPEC pairs.
348 (let ((face (nth 0 args)) 349 (let ((face (nth 0 args))