[gnus git] branch master updated: m0-3-146-ge7b803c =3= Merge branch 'master' of https://git.gnus.org/gnus ; Further non-group buffer fixups ; Ephemeral group border case fixup

       via  e7b803c97811f4a42e3b0a4e1bfac7b8d0e43e88 (commit)
       via  f5fea1686c14256e34f064beb9cfbd206bbef0ea (commit)
       via  31c28e438ad11d0e4dfa251bf705ef2d2b5ee972 (commit)
      from  62d2c12d145fa844f823b5242d11b45dde1d23ef (commit)


- Log -----------------------------------------------------------------
commit e7b803c97811f4a42e3b0a4e1bfac7b8d0e43e88
Merge: f5fea16 62d2c12
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Thu Apr 12 20:11:40 2012 +0200

    Merge branch 'master' of https://git.gnus.org/gnus


commit f5fea1686c14256e34f064beb9cfbd206bbef0ea
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Thu Apr 12 20:09:29 2012 +0200

    Further non-group buffer fixups
    
    * gnus-sum.el (gnus-handle-ephemeral-exit): Avoid creating the group
    buffer if it doesn't exist.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0ea8277..075036a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2012-04-12  Lars Magne Ingebrigtsen  <[email protected]>
 
+	* gnus-sum.el (gnus-handle-ephemeral-exit): Avoid creating the group
+	buffer if it doesn't exist.
+
 	* gnus-group.el (gnus-group-read-ephemeral-group): If no quit-config is
 	given, mark the group as ephemeral with the current window conf.
 
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 5f9cc3c..b99b2fb 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -7363,7 +7363,8 @@ If FORCE (the prefix), also save the .newsrc file(s)."
   "Handle movement when leaving an ephemeral group.
 The state which existed when entering the ephemeral is reset."
   (if (not (buffer-live-p (car quit-config)))
-      (gnus-configure-windows 'group 'force)
+      (when (buffer-live-p gnus-group-buffer)
+	(gnus-configure-windows 'group 'force))
     (set-buffer (car quit-config))
     (unless (eq (cdr quit-config) 'group)
       (setq gnus-current-select-method

commit 31c28e438ad11d0e4dfa251bf705ef2d2b5ee972
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Thu Apr 12 20:03:12 2012 +0200

    Ephemeral group border case fixup
    
    * gnus-group.el (gnus-group-read-ephemeral-group): If no quit-config is
    given, mark the group as ephemeral with the current window conf.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6841b50..0ea8277 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2012-04-12  Lars Magne Ingebrigtsen  <[email protected]>
 
+	* gnus-group.el (gnus-group-read-ephemeral-group): If no quit-config is
+	given, mark the group as ephemeral with the current window conf.
+
 	* gnus-sum.el (gnus-set-global-variables): Don't assume that the group
 	buffer exists, which it doesn't if we haven't started Gnus.
 	(gnus-summary-exit): Allow quitting when we don't have a group buffer.
diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index ca745f4..b777436 100644
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -2315,14 +2315,17 @@ Return the name of the group if selection was successful."
      `(-1 nil (,group
 	       ,gnus-level-default-subscribed nil nil ,method
 	       ,(cons
+		 (cons 'quit-config
 		 (cond
 		  (quit-config
-		   (cons 'quit-config quit-config))
+			 quit-config)
 		  ((assq gnus-current-window-configuration
 			 gnus-buffer-configuration)
-		   (cons 'quit-config
 			 (cons gnus-summary-buffer
-			       gnus-current-window-configuration))))
+			       gnus-current-window-configuration))
+			(t
+			 (cons (current-buffer)
+			       (current-window-configuration)))))
 		 parameters)))
      gnus-newsrc-hashtb)
     (push method gnus-ephemeral-servers)

-----------------------------------------------------------------------
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     |    6 ++++++
 lisp/gnus-group.el |   17 ++++++++++-------
 lisp/gnus-sum.el   |    3 ++-
 3 files changed, 18 insertions(+), 8 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