[Emacs-diffs] /srv/bzr/emacs/trunk r112339: lisp/faces.el (read-face-name): Bug fix, return just one face if arg multiple is nil

[Roland Winkler]

------------------------------------------------------------
revno: 112339
committer: Roland Winkler <address@hidden>
branch nick: trunk
timestamp: Sat 2013-04-20 12:33:52 -0500
message:
  lisp/faces.el (read-face-name): Bug fix, return just one face if arg multiple 
is nil
modified:
  lisp/ChangeLog
  lisp/faces.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-04-20 16:24:04 +0000
+++ b/lisp/ChangeLog    2013-04-20 17:33:52 +0000
@@ -1,3 +1,8 @@
+2013-04-20  Roland Winkler  <address@hidden>
+
+       * faces.el (read-face-name): Bug fix, return just one face if arg
+       multiple is nil.  (Bug#14209)
+
 2013-04-20  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/nadvice.el (advice--where-alist): Add :override.

=== modified file 'lisp/faces.el'
--- a/lisp/faces.el     2013-04-13 01:10:09 +0000
+++ b/lisp/faces.el     2013-04-20 17:33:52 +0000
@@ -979,9 +979,8 @@
       ;; (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)