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

[Richard M . Stallman]

Index: emacs/lisp/faces.el
diff -c emacs/lisp/faces.el:1.297 emacs/lisp/faces.el:1.298
*** emacs/lisp/faces.el:1.297   Thu Dec 23 18:28:13 2004
--- emacs/lisp/faces.el Fri Dec 31 15:21:47 2004
***************
*** 854,865 ****
                      (get-char-property (point) 'face)))
        faces)
      ;; Make a list of the named faces that the `face' property uses.
!     (if (listp faceprop)
        (dolist (f faceprop)
          (if (symbolp f)
              (push f faces)))
        (if (symbolp faceprop)
!         (setq faces (list faceprop))))
      ;; If there are none, try to get a face name from the buffer.
      (if (and (null faces)
             (memq (intern-soft (thing-at-point 'symbol)) (face-list)))
--- 854,868 ----
                      (get-char-property (point) 'face)))
        faces)
      ;; Make a list of the named faces that the `face' property uses.
!     (if (and (listp faceprop)
!            ;; Don't treat an attribute spec as a list of faces.
!            (not (keywordp (car faceprop)))
!            (not (memq (car faceprop) '(foreground-color background-color))))
        (dolist (f faceprop)
          (if (symbolp f)
              (push f faces)))
        (if (symbolp faceprop)
!         (push faceprop faces)))
      ;; If there are none, try to get a face name from the buffer.
      (if (and (null faces)
             (memq (intern-soft (thing-at-point 'symbol)) (face-list)))