Only bind `coding-system-for-*' around the process open call to avoid auth-source...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e110b96263707eeb3cab4c0c6d07ca78006b7cd2..7fb9f323950ff2db93f33ae288d704a9a682554f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * mail/smtpmail.el (smtpmail-via-smtp): Only bind
+       `coding-system-for-*' around the process open call to avoid
+       auth-source side effects.
+
 2011-08-21  Chong Yidong  <cyd@stupidchicken.com>
 
        * term.el (term-mouse-paste): Yank primary selection (Bug#6845).

diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index caec69e7e9e4ec0798a741875e0be5273bde1dfb..381af3b963a69c5a3dd9a4c899aafe03ad5076b1 100644 (file)
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -622,8 +622,6 @@ The list is in preference order.")
                            (and mail-specify-envelope-from
                                 (mail-envelope-from))
                            user-mail-address))
-       (coding-system-for-read 'binary)
-       (coding-system-for-write 'binary)
        response-code
        process-buffer
        result
@@ -642,21 +640,23 @@ The list is in preference order.")
            (erase-buffer))
 
          ;; open the connection to the server
-         (setq result
-               (open-network-stream
-                "smtpmail" process-buffer host port
-                :type smtpmail-stream-type
-                :return-list t
-                :capability-command (format "EHLO %s\r\n" (smtpmail-fqdn))
-                :end-of-command "^[0-9]+ .*\r\n"
-                :success "^2.*\n"
-                :always-query-capabilities t
-                :starttls-function
-                (lambda (capabilities)
-                  (and (string-match "-STARTTLS" capabilities)
-                       "STARTTLS\r\n"))
-                :client-certificate t
-                :use-starttls-if-possible t))
+         (let ((coding-system-for-read 'binary)
+               (coding-system-for-write 'binary))
+           (setq result
+                 (open-network-stream
+                  "smtpmail" process-buffer host port
+                  :type smtpmail-stream-type
+                  :return-list t
+                  :capability-command (format "EHLO %s\r\n" (smtpmail-fqdn))
+                  :end-of-command "^[0-9]+ .*\r\n"
+                  :success "^2.*\n"
+                  :always-query-capabilities t
+                  :starttls-function
+                  (lambda (capabilities)
+                    (and (string-match "-STARTTLS" capabilities)
+                         "STARTTLS\r\n"))
+                  :client-certificate t
+                  :use-starttls-if-possible t)))
 
          ;; If we couldn't access the server at all, we give up.
          (unless (setq process (car result))