[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 4c06005: * lisp/faces.el (faces--attribute-at-point
From: |
Artur Malabarba |
Subject: |
[Emacs-diffs] master 4c06005: * lisp/faces.el (faces--attribute-at-point): Fix bug |
Date: |
Fri, 30 Oct 2015 17:20:14 +0000 |
branch: master
commit 4c060051bfcb2ac9b0f825adc9482c23c0b8ffc4
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>
* lisp/faces.el (faces--attribute-at-point): Fix bug
introduced by previous commit.
---
lisp/faces.el | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/lisp/faces.el b/lisp/faces.el
index 8c54809..f96df05 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 4c06005: * lisp/faces.el (faces--attribute-at-point): Fix bug,
Artur Malabarba <=