Mercurial > emacs
comparison lisp/gnus/gnus-srvr.el @ 72009:e7287a023d2c
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 116-117)
- Update from CVS
2006-07-18 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de>
[ Backported bug fixes from No Gnus. ]
* lisp/gnus/nnweb.el (nnweb-google-parse-1): Update regexp for author and date.
(nnweb-google-search): Respect nnweb-max-hits as upper bound.
(nnweb-request-article): Do proper xwfu encoding when fetching articles
by message-id.
* lisp/gnus/gnus-srvr.el (gnus-browse-unsubscribe-group): Don't subscribe
unsubscribed groups as if they were killed ones. It causes duplicate
entries in gnus-newsrc-alist.
2006-07-17 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-sum.el (gnus-summary-delete-article): Don't use TAB in doc
string.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-357
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 19 Jul 2006 01:06:00 +0000 |
parents | 1077b8039c32 |
children | e3694f1cb928 858cb33ae39d |
comparison
equal
deleted
inserted
replaced
72008:99cff808ae1e | 72009:e7287a023d2c |
---|---|
941 (setq group (gnus-group-real-name group))) | 941 (setq group (gnus-group-real-name group))) |
942 (if sub | 942 (if sub |
943 (progn | 943 (progn |
944 ;; Make sure the group has been properly removed before we | 944 ;; Make sure the group has been properly removed before we |
945 ;; subscribe to it. | 945 ;; subscribe to it. |
946 (gnus-kill-ephemeral-group group) | 946 (if (gnus-ephemeral-group-p group) |
947 (gnus-kill-ephemeral-group group)) | |
948 ;; We need to discern between killed/zombie groups and | |
949 ;; just unsubscribed ones. | |
947 (gnus-group-change-level | 950 (gnus-group-change-level |
948 (list t group gnus-level-default-subscribed | 951 (or (gnus-group-entry group) |
949 nil nil (if (gnus-server-equal | 952 (list t group gnus-level-default-subscribed |
950 gnus-browse-current-method "native") | 953 nil nil (if (gnus-server-equal |
951 nil | 954 gnus-browse-current-method "native") |
952 (gnus-method-simplify | 955 nil |
953 gnus-browse-current-method))) | 956 (gnus-method-simplify |
957 gnus-browse-current-method)))) | |
954 gnus-level-default-subscribed (gnus-group-level group) | 958 gnus-level-default-subscribed (gnus-group-level group) |
955 (and (car (nth 1 gnus-newsrc-alist)) | 959 (and (car (nth 1 gnus-newsrc-alist)) |
956 (gnus-gethash (car (nth 1 gnus-newsrc-alist)) | 960 (gnus-gethash (car (nth 1 gnus-newsrc-alist)) |
957 gnus-newsrc-hashtb)) | 961 gnus-newsrc-hashtb)) |
958 t) | 962 (null (gnus-group-entry group))) |
959 (delete-char 1) | 963 (delete-char 1) |
960 (insert ? )) | 964 (insert ? )) |
961 (gnus-group-change-level | 965 (gnus-group-change-level |
962 group gnus-level-unsubscribed gnus-level-default-subscribed) | 966 group gnus-level-unsubscribed gnus-level-default-subscribed) |
963 (delete-char 1) | 967 (delete-char 1) |