From: yamaoka <yamaoka>
Date: Mon, 12 Aug 2002 22:13:32 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: t-gnus-6_15_8-01-quimby~40
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=f2aa05662a8c4729f1d0646b4e733351037b995a;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf46209..82795ef 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-12  Simon Josefsson  <jas@extundo.com>
+
+	* imap.el (imap-shell-open): Allow non-list `imap-shell-program'.
+	(imap-shell-open): Skip initial junk before IMAP greeting.
+
 2002-08-11  Simon Josefsson  <jas@extundo.com>
 
 	* message-utils.el (message-xpost-default,
diff --git a/lisp/imap.el b/lisp/imap.el
index 33bd7d2..4871c08 100644
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -656,7 +656,8 @@ If ARGS, PROMPT is used as an argument to `format'."
   nil)
 
 (defun imap-shell-open (name buffer server port)
-  (let ((cmds imap-shell-program)
+  (let ((cmds (if (listp imap-shell-program) imap-shell-program
+		(list imap-shell-program)))
 	cmd done)
     (while (and (not done) (setq cmd (pop cmds)))
       (message "imap: Opening IMAP connection with `%s'..." cmd)
@@ -675,7 +676,8 @@ If ARGS, PROMPT is used as an argument to `format'."
 	(when process
 	  (while (and (memq (process-status process) '(open run))
 		      (set-buffer buffer) ;; XXX "blue moon" nntp.el bug
-		      (goto-char (point-min))
+		      (goto-char (point-max))
+		      (forward-line -1)
 		      (not (imap-parse-greeting)))
 	    (accept-process-output process 1)
 	    (sit-for 1))