# HG changeset patch
# User Simon Josefsson <jas@extundo.com>
# Date 1097520138 0
# Node ID a2b628fd6c73d5d7a824a25534c4694ca6f65480
# Parent  2b938e7f92a5b11e486db88d18a6e831c44614e1
*** empty log message ***

diff -r 2b938e7f92a5 -r a2b628fd6c73 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Oct 11 18:42:00 2004 +0000
+++ b/lisp/ChangeLog	Mon Oct 11 18:42:18 2004 +0000
@@ -1,3 +1,11 @@
+2004-10-11  Simon Josefsson  <jas@extundo.com>
+
+	* mail/smtpmail.el (smtpmail-open-stream): Look for
+	starttls-gnutls-program instead of starttls-program iff
+	starttls-use-gnutls is non-nil.
+	(smtpmail-open-stream): Don't overwrite user settings of
+	starttls-extra-arguments and starttls-extra-args.
+
 2004-10-10  Kai Grossjohann  <kai.grossjohann@gmx.net>
 
 	* net/ange-ftp.el (ange-ftp-remote-shell): Remove variable.