Commit 680da3f8 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(set-face-attribute): Set face-modified prop to t

when we change the new-frame defaults.
(face-spec-set): Set face-modified prop to nil
when we change the new-frame defaults.
parent cccc806d
...@@ -664,6 +664,9 @@ of face names. Attributes from inherited faces are merged into the face ...@@ -664,6 +664,9 @@ of face names. Attributes from inherited faces are merged into the face
like an underlying face would be, with higher priority than underlying faces." like an underlying face would be, with higher priority than underlying faces."
(let ((where (if (null frame) 0 frame))) (let ((where (if (null frame) 0 frame)))
(setq args (purecopy args)) (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 (while args
(internal-set-lisp-face-attribute face (car args) (internal-set-lisp-face-attribute face (car args)
(purecopy (cadr args)) (purecopy (cadr args))
...@@ -1378,7 +1381,11 @@ If SPEC is nil, do nothing." ...@@ -1378,7 +1381,11 @@ If SPEC is nil, do nothing."
(setq attribute nil)))) (setq attribute nil))))
(when attribute (when attribute
(set-face-attribute face frame attribute value))) (set-face-attribute face frame attribute value)))
(setq attrs (cdr (cdr attrs)))))) (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) (defun face-attr-match-p (face attrs &optional frame)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment