[Emacs-diffs] master 0c7b096: lisp/gnus/nnimap.el (nnimap-request-group): Make it possible to enter nnimap groups again

[Katsumi Yamaoka]

branch: master
commit 0c7b0967d262bd361de721d0d7a4da192bde1319
Author: Lars Magne Ingebrigtsen <address@hidden>
Commit: Katsumi Yamaoka <address@hidden>

    lisp/gnus/nnimap.el (nnimap-request-group): Make it possible to enter 
nnimap groups again
---
 lisp/gnus/ChangeLog |    2 ++
 lisp/gnus/nnimap.el |    7 +++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e4818d4..64608d3 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 0fe2bb5..e619c0f 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