gnus-util.el (gnus-emacs-completing-read): Fix a filter for XEmacs

2 files changed, 10 insertions, 3 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index b4d3627d711..a48d2d1d1de 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-util.el (gnus-emacs-completing-read): Fix a filter for XEmacs.
+
 2013-04-27  Glenn Morris  <rgm@gnu.org>
 
         * gnus.el (gnus-list-debbugs):
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 331f9556710..a121c27b547 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -1549,9 +1549,12 @@ SPEC is a predicate specifier that contains stuff like `or', `and',
   "Call standard `completing-read-function'."
   (let ((completion-styles gnus-completion-styles))
     (completing-read prompt
-                     ;; Old XEmacs (at least 21.4) expect an alist for
-                     ;; collection.
-                     (mapcar 'list collection)
+                     ;; Old XEmacs (at least 21.4) expect an alist,
+                     ;; in which the car of each element is a string,
+                     ;; for collection.
+                     (mapcar (lambda (elem)
+                               (list (format "%s" (or (car-safe elem) elem))))
+                             collection)
                      nil require-match initial-input history def)))
 
 (autoload 'ido-completing-read "ido")