Revert "gnus-util.el (gnus-completing-read-function): Exclude gnus-icompleting-read...

This reverts commit bdad599288698c959b3829981357eb9c7a14a434.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c0b438f..f25e91b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,15 +1,5 @@
 2010-10-01  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-       * lpath.el: Fbing iswitchb-read-buffer for Emacs 22 and XEmacs; bind
-       completion-styles-alist and fbind ido-completing-read for XEmacs.
-
-       * 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-util.el b/lisp/gnus-util.el
index 3451cde..2f9bdd6 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -48,16 +48,13 @@
   #'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)
-               ,@(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-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
@@ -1598,11 +1595,6 @@ 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)

diff --git a/lisp/lpath.el b/lisp/lpath.el
index afca0ac..5af0e4e 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -31,7 +31,7 @@
        Info-index-next Info-menu bbdb-complete-name bookmark-default-handler
        bookmark-get-bookmark-record bookmark-make-record-default
        bookmark-prop-get display-time-event-handler epg-check-configuration
-       find-coding-system frame-device iswitchb-read-buffer recenter-top-bottom
+       find-coding-system frame-device recenter-top-bottom
        rmail-swap-buffers-maybe w3-do-setup w3-parse-buffer w3-prepare-buffer
        w3-region w3m-detect-meta-charset w3m-region))
     (maybe-bind
@@ -60,8 +60,7 @@
      display-time-event-handler epg-check-configuration event-click-count
      event-end event-start find-coding-systems-for-charsets
      find-coding-systems-region find-coding-systems-string find-image
-     float-time help-buffer ido-completing-read image-size
-     image-type-available-p insert-image iswitchb-read-buffer
+     float-time help-buffer image-size image-type-available-p insert-image
      mail-abbrevs-setup make-mode-line-mouse-map make-network-process
      mouse-minibuffer-check mouse-movement-p mouse-scroll-subr overlay-lists
      pgg-display-output-buffer posn-point posn-window put-image read-event
@@ -72,12 +71,11 @@
      window-edges))
   (maybe-bind
    '(adaptive-fill-first-line-regexp
-     buffer-display-table completion-styles completion-styles-alist
-     cursor-in-non-selected-windows default-enable-multibyte-characters
-     default-file-name-coding-system eudc-protocol filladapt-mode
-     gnus-agent-expire-current-dirs help-xref-stack-item idna-program
-     installation-directory line-spacing mark-active
-     mouse-selection-click-count mouse-selection-click-count-buffer
+     buffer-display-table completion-styles cursor-in-non-selected-windows
+     default-enable-multibyte-characters default-file-name-coding-system
+     eudc-protocol filladapt-mode gnus-agent-expire-current-dirs
+     help-xref-stack-item idna-program installation-directory line-spacing
+     mark-active mouse-selection-click-count mouse-selection-click-count-buffer
      ps-print-color-p rmail-default-file rmail-default-rmail-file
      rmail-insert-mime-forwarded-message-function show-trailing-whitespace
      smtpmail-default-smtp-server temporary-file-directory tool-bar-mode