[Emacs-diffs] /srv/bzr/emacs/trunk r112429: gnus-util.el (gnus-emacs-completing-read): Fix a filter for XEmacs

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 112429
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2013-05-01 00:29:13 +0000
message:
  gnus-util.el (gnus-emacs-completing-read): Fix a filter for XEmacs
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-util.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-04-27 23:57:29 +0000
+++ b/lisp/gnus/ChangeLog       2013-05-01 00:29:13 +0000
@@ -1,3 +1,7 @@
+2013-05-01  Katsumi Yamaoka  <address@hidden>
+
+       * gnus-util.el (gnus-emacs-completing-read): Fix a filter for XEmacs.
+
 2013-04-27  Glenn Morris  <address@hidden>
 
        * gnus.el (gnus-list-debbugs):

=== modified file 'lisp/gnus/gnus-util.el'
--- a/lisp/gnus/gnus-util.el    2013-02-14 00:44:38 +0000
+++ b/lisp/gnus/gnus-util.el    2013-05-01 00:29:13 +0000
@@ -1549,9 +1549,12 @@
   "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")