/[emacs]/emacs/lisp/faces.el
ViewVC logotype

Diff of /emacs/lisp/faces.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.278 by jpw, Mon May 26 19:15:42 2003 UTC revision 1.279 by rms, Wed May 28 11:17:33 2003 UTC
# Line 664  of face names.  Attributes from inherite Line 664  of face names.  Attributes from inherite
664  like an underlying face would be, with higher priority than underlying faces."  like an underlying face would be, with higher priority than underlying faces."
665    (let ((where (if (null frame) 0 frame)))    (let ((where (if (null frame) 0 frame)))
666      (setq args (purecopy args))      (setq args (purecopy args))
667        ;; If we set the new-frame defaults, this face is modified outside Custom.
668        (if (memq where '(0 t))
669            (put face 'face-modified t))
670      (while args      (while args
671        (internal-set-lisp-face-attribute face (car args)        (internal-set-lisp-face-attribute face (car args)
672                                          (purecopy (cadr args))                                          (purecopy (cadr args))
# Line 1378  If SPEC is nil, do nothing." Line 1381  If SPEC is nil, do nothing."
1381                 (setq attribute nil))))                 (setq attribute nil))))
1382          (when attribute          (when attribute
1383            (set-face-attribute face frame attribute value)))            (set-face-attribute face frame attribute value)))
1384        (setq attrs (cdr (cdr attrs))))))        (setq attrs (cdr (cdr attrs)))))
1385      ;; When we reset the face based on its spec, then it is unmodified
1386      ;; as far as Custom is concerned.
1387      (if (null frame)
1388          (put face 'face-modified nil)))
1389    
1390    
1391  (defun face-attr-match-p (face attrs &optional frame)  (defun face-attr-match-p (face attrs &optional frame)

Legend:
Removed from v.1.278  
changed lines
  Added in v.1.279

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26