Mercurial > emacs

changeset 87485:0ef4914a2852

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(custom-declare-face): Per frame, use `face-spec-set-2'. (custom-theme-set-faces): Clear `face-override-spec' property. Call `face-spec-set' with FOR-DEFFACE.
author Richard M. Stallman <rms@gnu.org>
date Sun, 30 Dec 2007 03:35:05 +0000
parents 531c5185ef7c
children a4cfa0059507
files lisp/cus-face.el
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/cus-face.el	Sun Dec 30 03:33:21 2007 +0000
+++ b/lisp/cus-face.el	Sun Dec 30 03:35:05 2007 +0000
@@ -46,7 +46,7 @@
 	  (make-empty-face face)
 	  ;; Create frame-local faces
 	  (dolist (frame (frame-list))
-	    (face-spec-set face value frame)
+	    (face-spec-set-2 face frame value)
 	    (when (memq (window-system frame) '(x w32 mac))
 	      (setq have-window-system t)))
 	  ;; When making a face after frames already exist
@@ -342,7 +342,8 @@
 		(unless (facep face)
 		  (make-empty-face face))
 		(put face 'face-comment comment)
-		(face-spec-set face spec nil))
+		(put face 'face-override-spec nil)
+		(face-spec-set face spec t))
 	      (setq args (cdr args)))
 	  ;; Old format, a plist of FACE SPEC pairs.
 	  (let ((face (nth 0 args))