Mercurial > emacs

changeset 110772:cd2496a17cf2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Tue, 05 Oct 2010 06:36:32 +0000
parents de3e1c0c0af3
children 22b487462b5a
files lisp/gnus/ChangeLog lisp/gnus/gnus-registry.el lisp/gnus/gnus-util.el
diffstat 3 files changed, 28 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog	Mon Oct 04 21:19:58 2010 -0700
+++ b/lisp/gnus/ChangeLog	Tue Oct 05 06:36:32 2010 +0000
@@ -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.
 
--- a/lisp/gnus/gnus-registry.el	Mon Oct 04 21:19:58 2010 -0700
+++ b/lisp/gnus/gnus-registry.el	Tue Oct 05 06:36:32 2010 +0000
@@ -1153,13 +1153,16 @@
 (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."
--- a/lisp/gnus/gnus-util.el	Mon Oct 04 21:19:58 2010 -0700
+++ b/lisp/gnus/gnus-util.el	Tue Oct 05 06:36:32 2010 +0000
@@ -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)