[gnus git] branch master updated: m0-5-216-g44d47c0 =2= Further multiple article buffer fixes ; Keep track of the equivalent summary buffer for each article buffer

       via  44d47c062e733634110616063cd9b21a6b151cd0 (commit)
       via  eea76426073dc49dd9f17e24fbf0266cb3606b27 (commit)
      from  152b8331ec8e0d49c005b2b19bfacc77df882c46 (commit)


- Log -----------------------------------------------------------------
commit 44d47c062e733634110616063cd9b21a6b151cd0
Author: Lars Ingebrigtsen <[email protected]>
Date:   Tue Dec 25 21:07:31 2012 +0100

    Further multiple article buffer fixes
    
    * gnus-sum.el (gnus-set-global-variables): Don't copy over the summary
    buffer to the article buffer here, because that clobbers multiple
    article buffers.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 69da559..a9127c8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2012-12-25  Lars Ingebrigtsen  <[email protected]>
 
+	* gnus-sum.el (gnus-set-global-variables): Don't copy over the summary
+	buffer to the article buffer here, because that clobbers multiple
+	article buffers.
+
 	* gnus-art.el (gnus-article-setup-buffer): Make sure that the article
 	buffer always points to the right summary buffer.
 
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index e57f90e..050ea2a 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -3497,8 +3497,8 @@ If the setup was successful, non-nil is returned."
 	  (set-buffer buffer)
 	  (setq gnus-summary-buffer (current-buffer))
 	  (not gnus-newsgroup-prepared))
-      ;; Fix by Sudish Joseph <[email protected]>
-      (setq gnus-summary-buffer (set-buffer (gnus-get-buffer-create buffer)))
+      (set-buffer (gnus-get-buffer-create buffer))
+      (setq gnus-summary-buffer (current-buffer))
       (gnus-summary-mode group)
       (when (gnus-group-quit-config group)
 	(set (make-local-variable 'gnus-single-article-buffer) nil))
@@ -3556,11 +3556,7 @@ buffer that was in action when the last article was fetched."
 	    (if (consp (car locals))
 		(set (caar locals) (pop vlist))
 	      (set (car locals) (pop vlist)))
-	    (setq locals (cdr locals))))
-	;; The article buffer also has local variables.
-	(when (gnus-buffer-live-p gnus-article-buffer)
-	  (set-buffer gnus-article-buffer)
-	  (setq gnus-summary-buffer summary))))))
+	    (setq locals (cdr locals))))))))
 
 (defun gnus-summary-article-unread-p (article)
   "Say whether ARTICLE is unread or not."
@@ -7882,7 +7878,6 @@ If STOP is non-nil, just stop when reaching the end of the message.
 
 Also see the variable `gnus-article-skip-boring'."
   (interactive "P")
-  (setq gnus-summary-buffer (current-buffer))
   (gnus-set-global-variables)
   (let ((article (gnus-summary-article-number))
 	(article-window (get-buffer-window gnus-article-buffer t))

commit eea76426073dc49dd9f17e24fbf0266cb3606b27
Author: Lars Ingebrigtsen <[email protected]>
Date:   Tue Dec 25 20:59:34 2012 +0100

    Keep track of the equivalent summary buffer for each article buffer
    
    * gnus-art.el (gnus-article-setup-buffer): Make sure that the article
    buffer always points to the right summary buffer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cddb9dd..69da559 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-25  Lars Ingebrigtsen  <[email protected]>
+
+	* gnus-art.el (gnus-article-setup-buffer): Make sure that the article
+	buffer always points to the right summary buffer.
+
 2012-12-25  John Wiegley  <[email protected]>
 
 	* auth-source.el (auth-source-netrc-parse): Allow using "password" as
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 9953d33..e5180a0 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -4540,18 +4540,17 @@ commands:
 	    (gnus-article-mode))
 	  (setq truncate-lines gnus-article-truncate-lines)
 	  (current-buffer))
+      (let ((summary gnus-summary-buffer))
       (with-current-buffer (gnus-get-buffer-create name)
 	(gnus-article-mode)
 	(setq truncate-lines gnus-article-truncate-lines)
-	(make-local-variable 'gnus-summary-buffer)
-	(setq gnus-summary-buffer
-	      (gnus-summary-buffer-name gnus-newsgroup-name))
+	  (set (make-local-variable 'gnus-summary-buffer) summary)
 	(gnus-summary-set-local-parameters gnus-newsgroup-name)
 	(when article-lapsed-timer
 	  (gnus-stop-date-timer))
 	(when gnus-article-update-date-headers
 	  (gnus-start-date-timer gnus-article-update-date-headers))
-	(current-buffer)))))
+	  (current-buffer))))))
 
 (defun gnus-article-stop-animations ()
   (dolist (timer (and (boundp 'timer-list)

-----------------------------------------------------------------------
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   |    9 +++++++++
 lisp/gnus-art.el |   23 +++++++++++------------
 lisp/gnus-sum.el |   11 +++--------
 3 files changed, 23 insertions(+), 20 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