Commit d7f5c16f authored by Roland Winkler's avatar Roland Winkler

lisp/faces.el (read-face-name): Bug fix, return just one face if arg multiple is nil

parent bcd7a0a4
2013-04-20 Roland Winkler <winkler@gnu.org>
* faces.el (read-face-name): Bug fix, return just one face if arg
multiple is nil. (Bug#14209)
2013-04-20 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/nadvice.el (advice--where-alist): Add :override.
......
......@@ -979,9 +979,8 @@ if the user entered more than one face name, return only the first one."
;; (for example, because DEFAULT was "all faces")
(if (facep face) (push (intern face) faces)))
;; Return either a list of faces or just one face.
(if multiple
(nreverse faces)
(last faces))))
(setq faces (nreverse faces))
(if multiple faces (car faces))))
;; Not defined without X, but behind window-system test.
(defvar x-bitmap-file-path)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment