Synch to No Gnus 200410261740.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6605379..e6eedc4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-26  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * nnimap.el (nnimap-open-connection): fixed prog1/prog2 bug
+
 2004-10-26  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * nnspool.el (nnspool-spool-directory): Use news-path if the
@@ -16,6 +20,7 @@
        * hashcash.el: Fix URL in comment, reported by Cheng Gao
        <chenggao@gmail.com>.
 
+>>>>>>> 7.511
 2004-10-25  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * html2text.el (html2text-buffer-head): Removed.  Use `goto-char'

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 77240a7..4a4a261 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -789,7 +789,7 @@ If EXAMINE is non-nil the group is selected read-only."
                    (list port)
                    (list "imap" "imaps"))))
       (if (imap-authenticate user passwd nnimap-server-buffer)
-         (prog1
+         (prog2
              (setq nnimap-server-buffer-alist
                    (nnimap-remove-server-from-buffer-alist 
                     server