Changes committed gnus/contrib (ChangeLog smtpmail.el)

Modified: ChangeLog smtpmail.el

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 1442, 1446-1447, 1452-1453, 1460, 1462, 1464, 1471-1472, 1476, 1479-1480, 1482, 1486-1488, 1490)

   - Update from CVS
   - Merge from gnus--devo--0

2008-11-21  Stefan Monnier  <[email protected]>

   * lisp/message.el (message-send-mail): Just set the buffer to unibyte
   rather than use mm-with-unibyte-current-buffer which does a lot more.
   (message-send-mail-partially): Don't bother with
   mm-with-unibyte-current-buffer since it's already been made unibyte by
   message-send-mail.

2008-11-19  Glenn Morris  <[email protected]>

   * texi/doclicense.texi: Change to FDL 1.3.
   Relicense all texi files under FDL 1.3 or later.

2008-11-10  Teodor Zlatanov  <[email protected]>

   * contrib/smtpmail.el (smtpmail-open-stream): Use
   `starttls-any-program-available'.  Auto-load starttls.el for it.

2008-11-01  Juanma Barranquero  <[email protected]>

   * lisp/md4.el (md4-buffer): Fix typo in docstring.
   (md4, md4-64): Doc fixes.
   (md4-pack-int32): Reflow docstring.

Revision: [email protected]/gnus--devo--0--patch-560


Index: ChangeLog
diff -u gnus/contrib/ChangeLog:7.78 gnus/contrib/ChangeLog:7.79
--- ChangeLog:7.78	Wed Jun 11 16:19:45 2008
+++ ChangeLog	Sat Dec  6 18:30:03 2008
@@ -1,3 +1,8 @@
+2008-11-10  Teodor Zlatanov  <[email protected]>
+
+	* smtpmail.el (smtpmail-open-stream): Use
+	`starttls-any-program-available'.  Auto-load starttls.el for it.
+
 2008-06-06  Stefan Monnier  <[email protected]>
 
 	* sendmail.el (mail-interactive): Change default.
Index: smtpmail.el
diff -u gnus/contrib/smtpmail.el:7.15 gnus/contrib/smtpmail.el:7.16
--- smtpmail.el:7.15	Wed Jun 11 16:19:45 2008
+++ smtpmail.el	Sat Dec  6 18:30:03 2008
@@ -73,6 +73,7 @@
     (error "Please use `smtpmail.el' bundled with Emacs.")))
 
 (require 'sendmail)
+(autoload 'starttls-any-program-available "starttls")
 (autoload 'starttls-open-stream "starttls")
 (autoload 'starttls-negotiate "starttls")
 (autoload 'mail-strip-quoted-names "mail-utils")
@@ -512,13 +513,7 @@
 (defun smtpmail-open-stream (process-buffer host port)
   (let ((cred (smtpmail-find-credentials
 	       smtpmail-starttls-credentials host port)))
-    (if (null (and cred (condition-case ()
-			    (with-no-warnings
-			      (require 'starttls)
-			      (call-process (if starttls-use-gnutls
-						starttls-gnutls-program
-					      starttls-program)))
-			  (error nil))))
+    (if (null (and cred (starttls-any-program-available)))
 	;; The normal case.
 	(open-network-stream "SMTP" process-buffer host port)
       (let* ((cred-key (smtpmail-cred-key cred))