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

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

Browse source
This commit is contained in:
Roland Winkler 2013-04-20 12:33:52 -05:00
parent bcd7a0a4c5
commit d7f5c16f47
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
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.

5
lisp/faces.el
View file

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