gnus-util.el (gnus-emacs-completing-read): Isolate XEmacs stuff

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 226d97fdf372d0ba7dfe9100d74a7125f900c106..afb8ee8f6e24bb8a4fb0575ad0ceb145e72fca43 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-util.el (gnus-emacs-completing-read): Isolate XEmacs stuff.
+
 2013-07-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-start.el (gnus-read-active-for-groups): Always mark the data as

diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 0f0e9675c71f460f25214c2dcaf9b583d6414f53..1d2ab2da24833dfeac055179d0929eb375abd06c 100644 (file)
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -1558,12 +1558,15 @@ 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,
-                    ;; in which the car of each element is a string,
-                    ;; for collection.
-                     (mapcar (lambda (elem)
-                              (list (format "%s" (or (car-safe elem) elem))))
-                            collection)
+                    (if (featurep 'xemacs)
+                        ;; 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)
+                      collection)
                      nil require-match initial-input history def)))
 
 (autoload 'ido-completing-read "ido")