gnus-util.el (gnus-completing-read-function): Exclude gnus-icompleting-read and gnus-ido-completing-read from candidates for XEmacs.

Silence the byte compiler.

2 files changed, 20 insertions, 5 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9c5653cadb9..e612c626f9f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,12 @@
 2010-10-01  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+        * gnus-util.el (gnus-completing-read-function): Exclude
+        gnus-icompleting-read and gnus-ido-completing-read from candidates for
+        XEmacs since iswitchb.el is very old and ido.el is unavailable in
+        XEmacs.
+        (iswitchb-mode, iswitchb-temp-buflist, iswitchb-read-buffer): Silence
+        the byte compiler.
+
         * gravatar.el: Don't load image.el that XEmacs doesn't provide.
         (gravatar-create-image): New function that's an alias to
         gnus-xmas-create-image, gnus-create-image, or create-image.
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 2f9bdd62e6e..3451cde6730 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -48,13 +48,16 @@
   #'gnus-std-completing-read
   "Function to do a completing read."
   :group 'gnus-meta
-  :type '(radio (function-item
+  :type `(radio (function-item
                  :doc "Use Emacs' standard `completing-read' function."
                  gnus-std-completing-read)
-                (function-item :doc "Use iswitchb's completing-read function."
-                               gnus-icompleting-read)
-                (function-item :doc "Use ido's completing-read function."
-                               gnus-ido-completing-read)
+                ,@(unless (featurep 'xemacs)
+                    '((function-item
+                       :doc "Use iswitchb's completing-read function."
+                       gnus-icompleting-read)
+                      (function-item
+                       :doc "Use ido's completing-read function."
+                       gnus-ido-completing-read)))
                 (function)))
 
 (defcustom gnus-completion-styles
@@ -1595,6 +1598,11 @@ SPEC is a predicate specifier that contains stuff like `or', `and',
   (completing-read prompt collection nil require-match
                    initial-input history def))
 
+(defvar iswitchb-mode)
+(defvar iswitchb-temp-buflist)
+(declare-function iswitchb-read-buffer "iswitchb"
+                  (prompt &optional default require-match start matches-set))
+
 (defun gnus-icompleting-read (prompt collection &optional require-match
                                      initial-input history def)
   (require 'iswitchb)