diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
| commit | ec0a80cc283badc7f7fd5ef78512dde6d34b1355 (patch) | |
| tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/faces.el | |
| parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
| parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
| download | emacs-25-merge.tar.gz | |
Merge emacs-25 into master (using imerge)emacs-25-merge
Diffstat (limited to 'lisp/faces.el')
| -rw-r--r-- | lisp/faces.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index f96df057cbd..ecd34a5280e 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -276,7 +276,7 @@ If FRAME is omitted or nil, use the selected frame." (defun face-list-p (face-or-list) "True if FACE-OR-LIST is a list of faces. Return nil if FACE-OR-LIST is a non-nil atom, or a cons cell whose car -is either 'foreground-color, 'background-color, or a keyword." +is either `foreground-color', `background-color', or a keyword." ;; The logic of merge_face_ref (xfaces.c) is recreated here. (and (listp face-or-list) (not (memq (car face-or-list) @@ -1971,7 +1971,9 @@ unnamed faces (e.g, `foreground-color')." (get-char-property (point) 'font-lock-face)) (get-char-property (point) 'face))) (found nil)) - (dolist (face (if (listp faces) faces (list faces))) + (dolist (face (if (face-list-p faces) + faces + (list faces))) (cond (found) ((and face (symbolp face)) (let ((value (face-attribute-specified-or |