Merge changes made in Gnus trunk.

auth.texi (GnuPG and EasyPG Assistant Configuration): Fix syntax and trim sentence.
shr.el (shr-current-column): Remove buggy and unnecessary function.
auth.texi: Fix up pxref/xref.
auth.texi (GnuPG and EasyPG Assistant Configuration): Fix up the @item syntax for in-Emacs makeinfo.
gnus-spec.el (gnus-parse-simple-format): princ doesn't really insert anything in Emacs.
mm-decode.el (mm-shr): Allow use from non-Gnus users.
nnimap.el (nnimap-parse-flags): Be more strict when looking for FETCH responses.
nnimap.el, tls.el: Rip the STARTTLS stuff out of tls.el again, and just bind it directly from nnimap.
shr.el (shr-find-fill-point): Use a filling algorithm that should probably work for CJVK text, too.
nnimap.el (nnimap-open-connection): Fix open-tls-stream call.
nnimap.el (nnimap-parse-flags): Fix regexp.
tls.el (tls-program): Remove spurious %s from openssl.
shr.el (shr-find-fill-point): Don't inloop on indented text.

1 files changed, 3 insertions, 17 deletions

diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index c6c8787a6c0..5aca6f3c835 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -318,11 +318,10 @@ textual parts.")
 		 (setq port (or nnimap-server-port "imap")))
 		'("imap"))
 	       ((eq nnimap-stream 'starttls)
-		(let ((tls-program (nnimap-extend-tls-programs)))
+		(let ((tls-program "openssl s_client %s -connect %h:%p -no_ssl2 -ign_eof -starttls imap"))
 		  (open-tls-stream
 		   "*nnimap*" (current-buffer) nnimap-address
-		   (setq port (or nnimap-server-port "imap"))
-		   'starttls))
+		   (setq port (or nnimap-server-port "imap"))))
 		'("imap"))
 	       ((memq nnimap-stream '(ssl tls))
 		(funcall (if (fboundp 'open-gnutls-stream)
@@ -419,19 +418,6 @@ textual parts.")
 		(nnimap-command "ENABLE QRESYNC"))
 	      (nnimap-process nnimap-object))))))))
 
-(defun nnimap-extend-tls-programs ()
-  (let ((programs tls-program)
-	result)
-    (unless (consp programs)
-      (setq programs (list programs)))
-    (dolist (program programs)
-      (when (assoc (car (split-string program)) tls-starttls-switches)
-	(push (if (not (string-match "%s" program))
-		  (concat program " " "%s")
-		program)
-	      result)))
-    (nreverse result)))
-
 (defun nnimap-find-parameter (parameter elems)
   (let (result)
     (dolist (elem elems)
@@ -1303,7 +1289,7 @@ textual parts.")
 		(setq start end))
 	    (setq start (point))
 	    (goto-char end))
-	  (while (search-forward " FETCH " start t)
+	  (while (re-search-forward "^\\* [0-9]+ FETCH " start t)
 	    (setq elems (read (current-buffer)))
 	    (push (cons (cadr (memq 'UID elems))
 			(cadr (memq 'FLAGS elems)))