procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
introduced by previous commit.
This commit is contained in:
Artur Malabarba 2015-10-30 18:19:26 +00:00
parent 76033d22a2
commit 4c060051bf
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lisp/faces.el
View file

@ -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