[gnus git] branch master updated: n0-17-215-g5fcf941 =1= * nnir.el (nnir-warp-to-article): Clean up summary buffer.

       via  5fcf9414d64f92eef4f50a136fe4cd59a84fbcd2 (commit)
      from  b6db12b0d4359f3472512d3384c47c4c025c8183 (commit)


- Log -----------------------------------------------------------------
commit 5fcf9414d64f92eef4f50a136fe4cd59a84fbcd2
Author: Andrew Cohen <[email protected]>
Date:   Tue Aug 2 15:51:03 2011 -0400

    * nnir.el (nnir-warp-to-article): Clean up summary buffer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 67f6b47..8d144ff 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,7 @@
 
 	* nnir.el (nnir-search-thread): Position point on referring article
 	line.
+	(nnir-warp-to-article): Clean up summary buffers.
 
 	* nnimap.el (nnimap-request-thread): Whitespace fix.
 
diff --git a/lisp/nnir.el b/lisp/nnir.el
index 5f0a2c6..d35e656 100644
--- a/lisp/nnir.el
+++ b/lisp/nnir.el
@@ -767,11 +767,18 @@ Add an entry here when adding a new search engine.")
 (deffoo nnir-warp-to-article ()
   (let* ((cur (if (> (gnus-summary-article-number) 0)
 		  (gnus-summary-article-number)
-		(error "This is not a real article.")))
-	 (gnus-newsgroup-name (nnir-article-group cur))
-         (backend-number (nnir-article-number cur)))
-    (gnus-summary-read-group-1 gnus-newsgroup-name t t gnus-summary-buffer
-			       nil (list backend-number))))
+		(error "This is not a real article")))
+	 (backend-article-group (nnir-article-group cur))
+         (backend-article-number (nnir-article-number cur))
+	 (quit-config (gnus-ephemeral-group-p gnus-newsgroup-name)))
+    ;; first exit from the nnir summary buffer.
+    (gnus-summary-exit)
+    ;; and if the nnir summary buffer in turn came from another
+    ;; summary buffer we have to clean that summary up too.
+    (when (eq (cdr quit-config) 'summary)
+      (gnus-summary-exit))
+    (gnus-summary-read-group-1 backend-article-group t t  nil
+			       nil (list backend-article-number))))
 
 (nnoo-define-skeleton nnir)
 

-----------------------------------------------------------------------
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 |    1 +
 lisp/nnir.el   |   17 ++++++++++++-----
 2 files changed, 13 insertions(+), 5 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