lpath.el: Fbind ido-completing-read, and bind iswitchb-mode and iswitchb-temp-buflist...

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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5fca37d..16969b7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,11 +1,17 @@
 2010-10-05  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-       * gnus-registry.el (gnus-registry-install-nnregistry): Rewrite so as
-       not to use `delete-dups' that is unavailable in XEmacs 21.4.
-
        * lpath.el: Fbind libxml-parse-html-region and shr-insert-document for
        Emacs 22 and XEmacs; fbind help-function-arglist for XEmacs 21.4 and
-       SXEmacs.
+       SXEmacs; fbind ido-completing-read, and bind iswitchb-mode and
+       iswitchb-temp-buflist 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.
+
+       * gnus-registry.el (gnus-registry-install-nnregistry): Rewrite so as
+       not to use `delete-dups' that is unavailable in XEmacs 21.4.
 
        * gnus-html.el: Don't require help-fns under XEmacs.
        (gnus-html-schedule-image-fetching): Work for XEmacs.

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index e4b8f8f..414f1c4 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -48,15 +48,18 @@
   "Function use to do completing read."
   :version "24.1"
   :group 'gnus-meta
-  :type '(radio (function-item
+  :type `(radio (function-item
                  :doc "Use Emacs standard `completing-read' function."
                  gnus-emacs-completing-read)
-                (function-item
-                 :doc "Use `ido-completing-read' function."
-                 gnus-ido-completing-read)
-                (function-item
-                 :doc "Use iswitchb based completing-read function."
-                 gnus-iswitchb-completing-read)))
+               ;; iswitchb.el is very old and ido.el is unavailable
+               ;; in XEmacs, so we exclude those function items.
+               ,@(unless (featurep 'xemacs)
+                   '((function-item
+                      :doc "Use `ido-completing-read' function."
+                      gnus-ido-completing-read)
+                     (function-item
+                      :doc "Use iswitchb based completing-read function."
+                      gnus-iswitchb-completing-read)))))
 
 (defcustom gnus-completion-styles
   (if (and (boundp 'completion-styles-alist)

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 390e3e4..7726dff 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -61,24 +61,24 @@
      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 image-size image-type-available-p insert-image
-     libxml-parse-html-region 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 recenter-top-bottom
-     rmail-msg-restore-non-pruned-header rmail-swap-buffers-maybe
-     select-safe-coding-system shr-insert-document sort-coding-systems
-     track-mouse ucs-to-char url-generic-parse-url url-insert-file-contents
-     vcard-pretty-print w3-parse-buffer w3m-detect-meta-charset w3m-region
-     window-edges))
+     float-time help-buffer ido-completing-read image-size
+     image-type-available-p insert-image libxml-parse-html-region
+     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
+     recenter-top-bottom rmail-msg-restore-non-pruned-header
+     rmail-swap-buffers-maybe select-safe-coding-system shr-insert-document
+     sort-coding-systems track-mouse ucs-to-char url-generic-parse-url
+     url-insert-file-contents vcard-pretty-print w3-parse-buffer
+     w3m-detect-meta-charset w3m-region 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
+     installation-directory iswitchb-mode iswitchb-temp-buflist 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