diff options
| author | Roland Winkler <[email protected]> | 2013-04-20 12:33:52 -0500 |
|---|---|---|
| committer | Roland Winkler <[email protected]> | 2013-04-20 12:33:52 -0500 |
| commit | d7f5c16f47faa5764ae83a175e765066f55176f0 (patch) | |
| tree | 45cd37154a71436a5bed1f16866eb5212656d8fa | |
| parent | bcd7a0a4c55f8226e9322d1ef438040fed2dc57e (diff) | |
lisp/faces.el (read-face-name): Bug fix, return just one face if arg multiple is nil
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/faces.el | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8758eb33e7..2f625deedc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-04-20 Roland Winkler <[email protected]> + + * faces.el (read-face-name): Bug fix, return just one face if arg + multiple is nil. (Bug#14209) + 2013-04-20 Stefan Monnier <[email protected]> * emacs-lisp/nadvice.el (advice--where-alist): Add :override. diff --git a/lisp/faces.el b/lisp/faces.el index de6d36c7ae..6179ed7dfa 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -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) |