[Emacs-diffs] trunk r113626: gnus-util.el (gnus-emacs-completing-read): Isolate XEmacs stuff

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 113626
revision-id: address@hidden
parent: address@hidden
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2013-08-01 03:51:41 +0000
message:
  gnus-util.el (gnus-emacs-completing-read): Isolate XEmacs stuff
modified:
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/gnus-util.el         
gnusutil.el-20091113204419-o5vbwnq5f7feedwu-1140

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-07-30 22:09:37 +0000
+++ b/lisp/gnus/ChangeLog       2013-08-01 03:51:41 +0000
@@ -1,3 +1,7 @@
+2013-08-01  Katsumi Yamaoka  <address@hidden>
+
+       * gnus-util.el (gnus-emacs-completing-read): Isolate XEmacs stuff.
+
 2013-07-30  Lars Magne Ingebrigtsen  <address@hidden>
 
        * gnus-start.el (gnus-read-active-for-groups): Always mark the data as

=== modified file 'lisp/gnus/gnus-util.el'
--- a/lisp/gnus/gnus-util.el    2013-05-23 07:52:19 +0000
+++ b/lisp/gnus/gnus-util.el    2013-08-01 03:51:41 +0000
@@ -1558,12 +1558,15 @@
   "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")