[gnus git] branch master updated: n0-17-65-g4c893e4 =3= (pop3-open-server): Erase the buffer after the greeting. ; (nnvirtual-request-article): Bind `gnus-command-method' so that the call chain it correct when we call "upwards". ; Auto-expiry doesn't make sense in read-only groups.
Lars Magne Ingebrigtsen <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via 4c893e4b485044c1ac40d3dc65cc98161cacc11e (commit)
via de2c7109b5ff559c0316036035c1727f78b541d2 (commit)
via 1291a5b7b2b2f699ed0d9d0bb98af869dc56d087 (commit)
from db67e44be5c5f0d5c24897796dc7113a71a2ad9e (commit)
- Log -----------------------------------------------------------------
commit 4c893e4b485044c1ac40d3dc65cc98161cacc11e
Author: Lars Magne Ingebrigtsen <[email protected]>
Date: Mon May 30 22:48:27 2011 +0200
(pop3-open-server): Erase the buffer after the greeting.
Not doing this seems to lead to a race condition in pop3-logon.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 34f1a51..b606f09 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2011-05-30 Lars Magne Ingebrigtsen <[email protected]>
+ * pop3.el (pop3-open-server): Erase the buffer after the greeting,
+ since not doing this seems to lead to a race condition in pop3-logon.
+
* nnvirtual.el (nnvirtual-request-article): Bind `gnus-command-method'
so that the call chain it correct when we call "upwards".
diff --git a/lisp/pop3.el b/lisp/pop3.el
index 43b01fb..90e11b3 100644
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -319,6 +319,7 @@ Returns the process associated with the connection."
(substring response (or (string-match "<" response) 0)
(+ 1 (or (string-match ">" response) -1)))))
(pop3-set-process-query-on-exit-flag (car result) nil)
+ (erase-buffer)
(car result)))))
;; Support functions
commit de2c7109b5ff559c0316036035c1727f78b541d2
Author: Lars Magne Ingebrigtsen <[email protected]>
Date: Mon May 30 22:41:27 2011 +0200
(nnvirtual-request-article): Bind `gnus-command-method' so that the call chain it correct when we call "upwards".
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce5dcd6..34f1a51 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2011-05-30 Lars Magne Ingebrigtsen <[email protected]>
+ * nnvirtual.el (nnvirtual-request-article): Bind `gnus-command-method'
+ so that the call chain it correct when we call "upwards".
+
* gnus-sum.el (gnus-select-newsgroup): Auto-expiry doesn't make sense
in read-only groups.
diff --git a/lisp/nnvirtual.el b/lisp/nnvirtual.el
index 0cc53ad..ea64c24 100644
--- a/lisp/nnvirtual.el
+++ b/lisp/nnvirtual.el
@@ -194,10 +194,11 @@ component group will show up when you enter the virtual group.")
(when buffer
(set-buffer buffer))
(let* ((gnus-override-method nil)
- (method (gnus-find-method-for-group
+ (gnus-command-method
+ (gnus-find-method-for-group
nnvirtual-last-accessed-component-group)))
- (funcall (gnus-get-function method 'request-article)
- article nil (nth 1 method) buffer)))))
+ (funcall (gnus-get-function gnus-command-method 'request-article)
+ article nil (nth 1 gnus-command-method) buffer)))))
;; This is a fetch by number.
(let* ((amap (nnvirtual-map-article article))
(cgroup (car amap)))
commit 1291a5b7b2b2f699ed0d9d0bb98af869dc56d087
Author: Lars Magne Ingebrigtsen <[email protected]>
Date: Mon May 30 22:06:06 2011 +0200
Auto-expiry doesn't make sense in read-only groups.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ba969f7..ce5dcd6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
2011-05-30 Lars Magne Ingebrigtsen <[email protected]>
+ * gnus-sum.el (gnus-select-newsgroup): Auto-expiry doesn't make sense
+ in read-only groups.
+
+ * gnus-group.el (gnus-group-mark-article-read): Ditto
+
* message.el (message-cite-reply-position): Doc string fix.
* nnimap.el (nnimap-transform-headers): Simplify regexp to hopefully
diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 65192bf..6c3a911 100644
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -3567,7 +3567,8 @@ or nil if no action could be taken."
(gnus-add-marked-articles group 'tick nil nil 'force)
(gnus-add-marked-articles group 'dormant nil nil 'force))
;; Do auto-expirable marks if that's required.
- (when (gnus-group-auto-expirable-p group)
+ (when (and (gnus-group-auto-expirable-p group)
+ (not (gnus-group-read-only-p group)))
(gnus-range-map
(lambda (article)
(gnus-add-marked-articles group 'expire (list article))
@@ -4633,7 +4634,8 @@ This command may read the active file."
(nreverse gnus-newsgroup-unselected)))))
(gnus-activate-group group)
(gnus-group-make-articles-read group (list article))
- (when (gnus-group-auto-expirable-p group)
+ (when (and (gnus-group-auto-expirable-p group)
+ (not (gnus-group-read-only-p group)))
(gnus-add-marked-articles
group 'expire (list article))))))
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 3ec4437..2d75c35 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -5715,7 +5715,8 @@ If SELECT-ARTICLES, only select those articles from GROUP."
(gnus-summary-remove-list-identifiers)
;; Check whether auto-expire is to be done in this group.
(setq gnus-newsgroup-auto-expire
- (gnus-group-auto-expirable-p group))
+ (and (gnus-group-auto-expirable-p group)
+ (not (gnus-group-read-only-p group))))
;; Set up the article buffer now, if necessary.
(unless (and gnus-single-article-buffer
(equal gnus-article-buffer "*Article*"))
-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.
Summary of changes:
lisp/ChangeLog | 11 +++++++++++
lisp/gnus-group.el | 6 ++++--
lisp/gnus-sum.el | 3 ++-
lisp/nnvirtual.el | 9 +++++----
lisp/pop3.el | 1 +
5 files changed, 23 insertions(+), 7 deletions(-)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".
The branch, master has been updated
hooks/post-receive
--
Gnus Project