# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1104506507 0
# Node ID c9bf2e1b7e1a263f25bbaef52a6c5203cdf596db
# Parent  73f5be00ba89919873f6a39685215dce22a3f39e
(read-face-name): Don't treat an attribute spec as a list of faces.

diff -r 73f5be00ba89 -r c9bf2e1b7e1a lisp/faces.el
--- a/lisp/faces.el	Fri Dec 31 15:13:00 2004 +0000
+++ b/lisp/faces.el	Fri Dec 31 15:21:47 2004 +0000
@@ -854,12 +854,15 @@
 		      (get-char-property (point) 'face)))
 	faces)
     ;; Make a list of the named faces that the `face' property uses.
-    (if (listp faceprop)
+    (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)
-	  (setq faces (list 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)))