Merge branch 'master' of https://git.gnus.org/gnus

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3510fa1..a0e7d49 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -11,24 +11,10 @@
        (tls-program): Add --insecure to be consistent with the defaults from
        openssl s_client.  Now all three commands are insecure.
 
- 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.
-
 2010-10-01  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * lpath.el: Bind completion-styles-alist for XEmacs.
+
        * 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/lpath.el b/lisp/lpath.el
index afca0ac..dc2d6cc 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