diff options
| author | Miles Bader <miles@gnu.org> | 2006-07-19 01:06:00 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-07-19 01:06:00 +0000 |
| commit | 7ce31649a332b78b39c78ef9bc12a377151bacd9 (patch) | |
| tree | 5dc33b86f252e5f9e2a1adb53a6eb1e0a99e8741 /lisp/gnus/gnus-srvr.el | |
| parent | 83676aa2e399363120942ef5ea19f8af6b75e8e8 (diff) | |
| download | emacs-7ce31649a332b78b39c78ef9bc12a377151bacd9.tar.gz | |
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
Diffstat (limited to 'lisp/gnus/gnus-srvr.el')
| -rw-r--r-- | lisp/gnus/gnus-srvr.el | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el index 5d4f9c2a3f6..aabf8efbf6b 100644 --- a/lisp/gnus/gnus-srvr.el +++ b/lisp/gnus/gnus-srvr.el @@ -943,19 +943,23 @@ If NUMBER, fetch this number of articles." (progn ;; Make sure the group has been properly removed before we ;; subscribe to it. - (gnus-kill-ephemeral-group group) + (if (gnus-ephemeral-group-p group) + (gnus-kill-ephemeral-group group)) + ;; We need to discern between killed/zombie groups and + ;; just unsubscribed ones. (gnus-group-change-level - (list t group gnus-level-default-subscribed - nil nil (if (gnus-server-equal - gnus-browse-current-method "native") - nil - (gnus-method-simplify - gnus-browse-current-method))) + (or (gnus-group-entry group) + (list t group gnus-level-default-subscribed + nil nil (if (gnus-server-equal + gnus-browse-current-method "native") + nil + (gnus-method-simplify + gnus-browse-current-method)))) gnus-level-default-subscribed (gnus-group-level group) (and (car (nth 1 gnus-newsrc-alist)) (gnus-gethash (car (nth 1 gnus-newsrc-alist)) gnus-newsrc-hashtb)) - t) + (null (gnus-group-entry group))) (delete-char 1) (insert ? )) (gnus-group-change-level |