From d7f5c16f47faa5764ae83a175e765066f55176f0 Mon Sep 17 00:00:00 2001 From: Roland Winkler Date: Sat, 20 Apr 2013 12:33:52 -0500 Subject: lisp/faces.el (read-face-name): Bug fix, return just one face if arg multiple is nil --- lisp/ChangeLog | 5 +++++ 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 + + * faces.el (read-face-name): Bug fix, return just one face if arg + multiple is nil. (Bug#14209) + 2013-04-20 Stefan Monnier * 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) -- cgit v1.2.3