From cfe96a5629cbac0bf5aebc817cf6865ecd9ad7a9 Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Thu, 1 Aug 2013 03:51:41 +0000 Subject: [PATCH] gnus-util.el (gnus-emacs-completing-read): Isolate XEmacs stuff --- lisp/gnus/ChangeLog | 4 ++++ lisp/gnus/gnus-util.el | 15 +++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index a951428756b..3d94e7d579f 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,7 @@ +2013-08-01 Katsumi Yamaoka + + * gnus-util.el (gnus-emacs-completing-read): Isolate XEmacs stuff. + 2013-07-30 Lars Magne Ingebrigtsen * 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 0f0e9675c71..1d2ab2da248 100644 --- 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") -- 2.11.4.GIT