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

[Glenn Morris]

Index: emacs/lisp/faces.el
diff -c emacs/lisp/faces.el:1.322 emacs/lisp/faces.el:1.323
*** emacs/lisp/faces.el:1.322   Wed Jun 22 02:31:48 2005
--- emacs/lisp/faces.el Wed Jun 22 14:20:18 2005
***************
*** 513,520 ****
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  
  (defun face-documentation (face)
!   "Get the documentation string for FACE."
!   (get face 'face-documentation))
  
  
  (defun set-face-documentation (face string)
--- 513,529 ----
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  
  (defun face-documentation (face)
!   "Get the documentation string for FACE.
! If FACE is a face-alias, get the documentation for the target face."
!   (let ((alias (get face 'face-alias))
!         doc)
!     (if alias
!         (progn
!           (setq doc (get alias 'face-documentation))
!           (format "%s is an alias for the face `%s'.%s" face alias
!                   (if doc (format "\n%s" doc)
!                     "")))
!       (get face 'face-documentation))))
  
  
  (defun set-face-documentation (face string)
***************
*** 661,667 ****
      (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))
--- 670,676 ----
      (setq args (purecopy args))
      ;; If we set the new-frame defaults, this face is modified outside Custom.
      (if (memq where '(0 t))
!       (put (or (get face 'face-alias) face) 'face-modified t))
      (while args
        (internal-set-lisp-face-attribute face (car args)
                                        (purecopy (cadr args))
***************
*** 1443,1449 ****
    ;; 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)
--- 1452,1458 ----
    ;; When we reset the face based on its spec, then it is unmodified
    ;; as far as Custom is concerned.
    (if (null frame)
!       (put (or (get face 'face-alias) face) 'face-modified nil)))
  
  
  (defun face-attr-match-p (face attrs &optional frame)