[gnus git] branch master updated: m0-11-132-g1b4d1bd =1= Make it possible to enter nnimap groups again

Lars <[email protected]> Thu, 29 Jan 2015 12:07:27 +0100
Newsgroups gmane.emacs.gnus.cvs
Message-ID <[email protected]>
       via  1b4d1bd1ca7a32d8f9cb7c1ffe02af08f2c4b2c6 (commit)
      from  062698a34df9fd679229f7dea14cfaaf408f87de (commit)


- Log -----------------------------------------------------------------
commit 1b4d1bd1ca7a32d8f9cb7c1ffe02af08f2c4b2c6
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Thu Jan 29 22:06:47 2015 +1100

    Make it possible to enter nnimap groups again
    
    (nnimap-request-group): Revert previous patch since that made it
    impossible to enter nnimap groups.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4a54d30..2de054a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,8 @@
 
 	* nnimap.el (nnimap-request-group): Allow running this function on
 	groups that don't exist in Gnus yet.
+	(nnimap-request-group): Revert previous patch since that made it
+	impossible to enter nnimap groups.
 
 	* message.el (message-smtpmail-send-it): Remove the mail header
 	separator before sending.
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 0fe2bb5..e619c0f 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -804,10 +804,9 @@ textual parts.")
 	articles active marks high low)
     (with-current-buffer nntp-server-buffer
       (when result
-	(when (and info
-		   (or (not dont-check)
+	(when (or (not dont-check)
 		  (not (setq active
-				  (nth 2 (assoc group nnimap-current-infos))))))
+			     (nth 2 (assoc group nnimap-current-infos)))))
 	  (let ((sequences (nnimap-retrieve-group-data-early
 			    server (list info))))
 	    (nnimap-finish-retrieve-group-infos server (list info) sequences

-----------------------------------------------------------------------
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 |    2 ++
 lisp/nnimap.el |    7 +++----
 2 files changed, 5 insertions(+), 4 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