From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Thu, 29 Jan 2015 14:02:04 +0000 (+0000)
Subject: lisp/gnus/nnimap.el (nnimap-request-group): Make it possible to enter nnimap groups... 
X-Git-Tag: emacs-25.0.90~2572^2~26
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0c7b0967d262bd361de721d0d7a4da192bde1319;p=emacs.git

lisp/gnus/nnimap.el (nnimap-request-group): Make it possible to enter nnimap groups again
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e4818d44a1c..64608d3bda0 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/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/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 0fe2bb5872c..e619c0f13c2 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/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)
-		       (not (setq active
-				  (nth 2 (assoc group nnimap-current-infos))))))
+	(when (or (not dont-check)
+		  (not (setq active
+			     (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