Mercurial > emacs
comparison lisp/gnus/gnus-registry.el @ 110772:cd2496a17cf2
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 | 42815c76b976 |
children | 7aa4fdb60d57 |
comparison
equal
deleted
inserted
replaced
110771:de3e1c0c0af3 | 110772:cd2496a17cf2 |
---|---|
1151 | 1151 |
1152 ;;;###autoload | 1152 ;;;###autoload |
1153 (defun gnus-registry-install-nnregistry () | 1153 (defun gnus-registry-install-nnregistry () |
1154 "Install the nnregistry refer method in `gnus-refer-article-method'." | 1154 "Install the nnregistry refer method in `gnus-refer-article-method'." |
1155 (interactive) | 1155 (interactive) |
1156 (setq gnus-refer-article-method | 1156 (cond ((eq 'nnregistry gnus-refer-article-method)) |
1157 (delete-dups | 1157 ((null gnus-refer-article-method) |
1158 (append | 1158 (setq gnus-refer-article-method 'nnregistry)) |
1159 (if (listp gnus-refer-article-method) | 1159 ((consp gnus-refer-article-method) |
1160 gnus-refer-article-method | 1160 (unless (memq 'nnregistry gnus-refer-article-method) |
1161 (list gnus-refer-article-method)) | 1161 (setq gnus-refer-article-method |
1162 (list 'nnregistry))))) | 1162 (append gnus-refer-article-method '(nnregistry))))) |
1163 (t | |
1164 (setq gnus-refer-article-method | |
1165 (list gnus-refer-article-method 'nnregistry))))) | |
1163 | 1166 |
1164 (defun gnus-registry-unload-hook () | 1167 (defun gnus-registry-unload-hook () |
1165 "Uninstall the registry hooks." | 1168 "Uninstall the registry hooks." |
1166 (interactive) | 1169 (interactive) |
1167 (remove-hook 'gnus-summary-article-move-hook 'gnus-registry-action) | 1170 (remove-hook 'gnus-summary-article-move-hook 'gnus-registry-action) |