From: Lars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Date: Sat, 27 Nov 2010 14:36:34 +0000 (+0100)
Subject: (proto-stream-open-network): Fix some typos.
X-Git-Url: https://cgit.sxemacs.org/?a=commitdiff_plain;h=658200daa0e8a9206ea594065921640b28293a0a;p=gnus

(proto-stream-open-network): Fix some typos.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7fe52c37b..f05a92f07 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -17,6 +17,8 @@
 
 2010-11-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* nnimap.el (nnimap-open-connection): Fix typo in STARTTLS command.
+
 	* proto-stream.el: New library to provide protocol-specific
 	TLS/STARTTLS connections for IMAP, NNTP, SMTP, POP3 and similar
 	protocols.
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index bab4cb85a..0041fe4ca 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -338,7 +338,7 @@ textual parts.")
 	     (if (not (string-match "STARTTLS" capabilities))
 		 ;; Not a STARTTLS-capable server.
 		 nil
-	       "1 STARTTLS")))
+	       "1 STARTTLS\r\n")))
 	(setf (nnimap-process nnimap-object) stream)
 	(if (not stream)
 	    (nnheader-report 'nnimap "Unable to contact %s:%s via %s"
@@ -1042,7 +1042,7 @@ textual parts.")
 		   uidvalidity
 		   modseq)
 	      (push
-	       (list (nnimap-send-command "EXAMINE %S (QRESYNC (%s %s))"
+	       (list (nnimap-send-command "EXAMINE %S (QRESYNC  (%s %s))"
 					  (utf7-encode group t)
 					  uidvalidity modseq)
 		     'qresync
diff --git a/lisp/proto-stream.el b/lisp/proto-stream.el
index 15c3033b9..226157a19 100644
--- a/lisp/proto-stream.el
+++ b/lisp/proto-stream.el
@@ -119,13 +119,13 @@ command to switch on STARTTLS otherwise."
 	    ;; Otherwise, just return this plain network connection.
 	    (list stream greeting capabilities)))
 	 ((fboundp 'open-gnutls-stream)
-	  (setq start (with-current-buffer buffer (point)))
+	  (setq start (with-current-buffer buffer (point-max)))
 	  (process-send-string stream starttls-command)
 	  (proto-stream-get-response stream start)
 	  (gnutls-negotiate stream nil)
 	  ;; Re-get the capabilities, since they may have changed
 	  ;; after switching to TLS.
-	  (setq start (with-current-buffer buffer (point)))
+	  (setq start (with-current-buffer buffer (point-max)))
 	  (process-send-string stream capability-command)
 	  (list stream greeting (proto-stream-get-response stream start)))
 	 (t
@@ -133,7 +133,7 @@ command to switch on STARTTLS otherwise."
 	  (proto-stream-open-starttls name buffer host service parameters)))))))
 
 (defun proto-stream-capabilities (stream command)
-  (let ((start (with-current-buffer (process-buffer stream) (point))))
+  (let ((start (with-current-buffer (process-buffer stream) (point-max))))
     (process-send-string stream command)
     (proto-stream-get-response stream start)))