From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Fri, 30 Oct 2015 18:19:26 +0000 (+0000)
Subject: * lisp/faces.el (faces--attribute-at-point): Fix bug
X-Git-Tag: emacs-25.0.90~956
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4c060051bfcb2ac9b0f825adc9482c23c0b8ffc4;p=emacs.git

* lisp/faces.el (faces--attribute-at-point): Fix bug

introduced by previous commit.
---

diff --git a/lisp/faces.el b/lisp/faces.el
index 8c5480905a1..f96df057cbd 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1965,12 +1965,13 @@ If ATTRIBUTE-UNNAMED is non-nil, it is a symbol to look for in
 unnamed faces (e.g, `foreground-color')."
   ;; `face-at-point' alone is not sufficient.  It only gets named faces.
   ;; Need also pick up any face properties that are not associated with named faces.
-  (let (found)
-    (dolist (face (or (get-char-property (point) 'read-face-name)
-                      ;; If `font-lock-mode' is on, `font-lock-face' takes precedence.
-                      (and font-lock-mode
-                           (get-char-property (point) 'font-lock-face))
-                      (get-char-property (point) 'face)))
+  (let ((faces (or (get-char-property (point) 'read-face-name)
+                   ;; If `font-lock-mode' is on, `font-lock-face' takes precedence.
+                   (and font-lock-mode
+                        (get-char-property (point) 'font-lock-face))
+                   (get-char-property (point) 'face)))
+        (found nil))
+    (dolist (face (if (listp faces) faces (list faces)))
       (cond (found)
             ((and face (symbolp face))
              (let ((value (face-attribute-specified-or