Commit 1225bc49 authored by Katsumi Yamaoka's avatar Katsumi Yamaoka
Browse files

Merge changes made ein Gnus trunk.

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.
parent 7b0e3048
2010-10-05 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.
* 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.
 
......
......@@ -1153,13 +1153,16 @@ Returns the first place where the trail finds a group name."
(defun gnus-registry-install-nnregistry ()
"Install the nnregistry refer method in `gnus-refer-article-method'."
(interactive)
(setq gnus-refer-article-method
(delete-dups
(append
(if (listp gnus-refer-article-method)
gnus-refer-article-method
(list gnus-refer-article-method))
(list 'nnregistry)))))
(cond ((eq 'nnregistry gnus-refer-article-method))
((null gnus-refer-article-method)
(setq gnus-refer-article-method 'nnregistry))
((consp gnus-refer-article-method)
(unless (memq 'nnregistry gnus-refer-article-method)
(setq gnus-refer-article-method
(append gnus-refer-article-method '(nnregistry)))))
(t
(setq gnus-refer-article-method
(list gnus-refer-article-method 'nnregistry)))))
(defun gnus-registry-unload-hook ()
"Uninstall the registry hooks."
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment