diff options
| author | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-10-05 06:36:32 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-10-05 06:36:32 +0000 |
| commit | 1225bc492980972db7a8c2c23fc4a65d35100e2f (patch) | |
| tree | fb1517f80a635317faaa9397a3209d11aa2e6245 | |
| parent | 7b0e3048f0359b6e1802cabf2c97299cdb2585fc (diff) | |
| download | emacs-1225bc492980972db7a8c2c23fc4a65d35100e2f.tar.gz | |
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.
| -rw-r--r-- | lisp/gnus/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/gnus/gnus-registry.el | 17 | ||||
| -rw-r--r-- | lisp/gnus/gnus-util.el | 17 |
3 files changed, 28 insertions, 14 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 75f806c3a5c..f378310b2b9 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,5 +1,13 @@ 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. diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el index cbea1e17ed8..45fa9561782 100644 --- a/lisp/gnus/gnus-registry.el +++ b/lisp/gnus/gnus-registry.el @@ -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." diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index e4b8f8f87da..414f1c45440 100644 --- a/lisp/gnus/gnus-util.el +++ b/lisp/gnus/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) |