[Emacs-diffs] Changes to emacs/lisp/faces.el

[Richard M. Stallman]

Index: emacs/lisp/faces.el
diff -c emacs/lisp/faces.el:1.278 emacs/lisp/faces.el:1.279
*** emacs/lisp/faces.el:1.278   Mon May 26 15:15:42 2003
--- emacs/lisp/faces.el Wed May 28 07:17:33 2003
***************
*** 664,669 ****
--- 664,672 ----
  like an underlying face would be, with higher priority than underlying faces."
    (let ((where (if (null frame) 0 frame)))
      (setq args (purecopy args))
+     ;; If we set the new-frame defaults, this face is modified outside Custom.
+     (if (memq where '(0 t))
+       (put face 'face-modified t))
      (while args
        (internal-set-lisp-face-attribute face (car args)
                                        (purecopy (cadr args))
***************
*** 1378,1384 ****
               (setq attribute nil))))
        (when attribute
          (set-face-attribute face frame attribute value)))
!       (setq attrs (cdr (cdr attrs))))))
  
  
  (defun face-attr-match-p (face attrs &optional frame)
--- 1381,1391 ----
               (setq attribute nil))))
        (when attribute
          (set-face-attribute face frame attribute value)))
!       (setq attrs (cdr (cdr attrs)))))
!   ;; When we reset the face based on its spec, then it is unmodified
!   ;; as far as Custom is concerned.
!   (if (null frame)
!       (put face 'face-modified nil)))
  
  
  (defun face-attr-match-p (face attrs &optional frame)