[Emacs-diffs] Changes to emacs/lisp/cus-face.el,v

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Richard M. Stallman <rms>       07/12/30 03:35:05

Index: cus-face.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/cus-face.el,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- cus-face.el 17 Sep 2007 02:55:09 -0000      1.50
+++ cus-face.el 30 Dec 2007 03:35:05 -0000      1.51
@@ -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))