From: yamaoka <yamaoka>
Date: Sun, 3 Jun 2001 23:35:38 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: t-gnus-6_15_4-02-quimby~38
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=c46cc083a82e86777f95ab92e19e3087badf7b6a;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 957b016..64246b0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2001-06-02  Simon Josefsson  <simon@josefsson.org>
+
+	* imap.el (imap-kerberos4-open): 
+	(imap-gssapi-open):
+	(imap-ssl-open):
+	(imap-network-open):
+	(imap-shell-open):
+	(imap-starttls-open): Set buffer to workaround spurious
+	`accept-process-output' buffer changes.  Thanks to Mats Lidell
+	<Mats.Lidell@contactor.se> for report and partial patch and Jake
+	Colman <colman@ppllc.com> for report.
+
 2001-05-31 13:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* gnus-sum.el (gnus-summary-catchup): New argument.
diff --git a/lisp/imap.el b/lisp/imap.el
index 110760a..57724f7 100644
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -453,6 +453,7 @@ If ARGS, PROMPT is used as an argument to `format'."
 	    (setq imap-client-eol "\n"
 		  imap-calculate-literal-size-first t)
 	    (while (and (memq (process-status process) '(open run))
+			(set-buffer buffer) ;; XXX "blue moon" nntp.el bug
 			(goto-char (point-min))
                         ;; cyrus 1.6.x (13? < x <= 22) queries capabilities
 		        (or (while (looking-at "^C:")
@@ -513,6 +514,7 @@ If ARGS, PROMPT is used as an argument to `format'."
 	    (setq imap-client-eol "\n"
 		  imap-calculate-literal-size-first t)
 	    (while (and (memq (process-status process) '(open run))
+			(set-buffer buffer) ;; XXX "blue moon" nntp.el bug
 			(goto-char (point-min))
                         ;; cyrus 1.6.x (13? < x <= 22) queries capabilities
 		        (or (while (looking-at "^C:")
@@ -578,6 +580,7 @@ If ARGS, PROMPT is used as an argument to `format'."
 	  (with-current-buffer buffer
 	    (goto-char (point-min))
 	    (while (and (memq (process-status process) '(open run))
+			(set-buffer buffer) ;; XXX "blue moon" nntp.el bug
 			(goto-char (point-max))
 			(forward-line -1)
 			(not (imap-parse-greeting)))
@@ -606,6 +609,7 @@ If ARGS, PROMPT is used as an argument to `format'."
 	 (process (open-network-stream-as-binary name buffer server port)))
     (when process
       (while (and (memq (process-status process) '(open run))
+		  (set-buffer buffer) ;; XXX "blue moon" nntp.el bug
 		  (goto-char (point-min))
 		  (not (imap-parse-greeting)))
 	(accept-process-output process 1)
@@ -640,6 +644,7 @@ If ARGS, PROMPT is used as an argument to `format'."
 			  ?l imap-default-user))))))
 	(when process
 	  (while (and (memq (process-status process) '(open run))
+		      (set-buffer buffer) ;; XXX "blue moon" nntp.el bug
 		      (goto-char (point-min))
 		      (not (imap-parse-greeting)))
 	    (accept-process-output process 1)
@@ -675,6 +680,7 @@ If ARGS, PROMPT is used as an argument to `format'."
     (message "imap: Connecting with STARTTLS...")
     (when process
       (while (and (memq (process-status process) '(open run))
+		  (set-buffer buffer) ;; XXX "blue moon" nntp.el bug
 		  (goto-char (point-min))
 		  (not (imap-parse-greeting)))
 	(accept-process-output process 1)