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

diff --cc lisp/ChangeLog
index 65cae79,1b49579..30296e6
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,8 -1,30 +1,33 @@@
+ 2010-10-05  Julien Danjou  <julien@danjou.info>
+ 
+       * gnus-util.el (gnus-emacs-completing-read)
+       (gnus-iswitchb-completing-read): Use autoload rather than require.
+ 
+ 2010-10-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+ 
+       * 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; 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.
+ 
+       * mm-decode.el (mm-shr): Decode contents by charset.
+ 
  2010-10-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
  
 +      * nnimap.el (nnimap-open-connection): Give an error if nnimap-stream is
 +      unknown.
 +
        * shr.el (shr-tag-blockquote): Ensure paragraph after quote, too.
        (shr-get-image-data): Ensure against the cache file missing.