[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101800: Merge changes made ein Gnus
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101800: Merge changes made ein Gnus trunk. |
Date: |
Tue, 05 Oct 2010 06:36:32 +0000 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101800
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2010-10-05 06:36:32 +0000
message:
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.
modified:
lisp/gnus/ChangeLog
lisp/gnus/gnus-registry.el
lisp/gnus/gnus-util.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2010-10-05 03:48:30 +0000
+++ b/lisp/gnus/ChangeLog 2010-10-05 06:36:32 +0000
@@ -1,5 +1,13 @@
2010-10-05 Katsumi Yamaoka <address@hidden>
+ * 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.
=== modified file 'lisp/gnus/gnus-registry.el'
--- a/lisp/gnus/gnus-registry.el 2010-10-01 23:08:25 +0000
+++ b/lisp/gnus/gnus-registry.el 2010-10-05 06:36:32 +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."
=== modified file 'lisp/gnus/gnus-util.el'
--- a/lisp/gnus/gnus-util.el 2010-10-04 22:26:51 +0000
+++ b/lisp/gnus/gnus-util.el 2010-10-05 06:36:32 +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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101800: Merge changes made ein Gnus trunk.,
Katsumi Yamaoka <=