# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1285916198 0
# Node ID 42798a7fad62f899c613f7767e82e79d62787be2
# Parent  bd7b628a1f6700c23d4fb60994f022376864edde
gnus-util.el (gnus-completing-read-function): Exclude gnus-icompleting-read and gnus-ido-completing-read from candidates for XEmacs.
Silence the byte compiler.

diff -r bd7b628a1f67 -r 42798a7fad62 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Fri Oct 01 05:50:11 2010 +0000
+++ b/lisp/gnus/ChangeLog	Fri Oct 01 06:56:38 2010 +0000
@@ -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 -r bd7b628a1f67 -r 42798a7fad62 lisp/gnus/gnus-util.el
--- a/lisp/gnus/gnus-util.el	Fri Oct 01 05:50:11 2010 +0000
+++ b/lisp/gnus/gnus-util.el	Fri Oct 01 06:56:38 2010 +0000
@@ -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 @@
   (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)