net/tls.el (open-tls-stream): Show the actual command being executed,

instead of the format string.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 28a7d514f4f09a7b0c8f4170f1c0b162cbce65eb..6eccc98dbe010fecdf38bf0c63dd60f3b6aed629 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-01  Magnus Henoch  <mange@freemail.hu>
+
+       * net/tls.el (open-tls-stream): Show the actual command being
+       executed, instead of the format string.
+
 2008-10-01  Eli Zaretskii  <eliz@gnu.org>
 
        * term/internal.el (dos-locale-alist): New alist.

diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index 64d113ae28ec163e59f0d2396f10d29ef896bd4a..dadc4e6018a86c0771a2881f053d6a68813adb68 100644 (file)
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -224,18 +224,20 @@ Fourth arg PORT is an integer specifying a port to connect to."
     (with-current-buffer buffer
       (message "Opening TLS connection to `%s'..." host)
       (while (and (not done) (setq cmd (pop cmds)))
-       (message "Opening TLS connection with `%s'..." cmd)
        (let ((process-connection-type tls-process-connection-type)
+             (formatted-cmd
+              (format-spec
+               cmd
+               (format-spec-make
+                ?h host
+                ?p (if (integerp port)
+                       (int-to-string port)
+                     port))))
              response)
+         (message "Opening TLS connection with `%s'..." formatted-cmd)
          (setq process (start-process
                         name buffer shell-file-name shell-command-switch
-                        (format-spec
-                         cmd
-                         (format-spec-make
-                          ?h host
-                          ?p (if (integerp port)
-                                 (int-to-string port)
-                               port)))))
+                        formatted-cmd))
          (while (and process
                      (memq (process-status process) '(open run))
                      (progn
@@ -244,7 +246,7 @@ Fourth arg PORT is an integer specifying a port to connect to."
                                         tls-success nil t)))))
            (unless (accept-process-output process 1)
              (sit-for 1)))
-         (message "Opening TLS connection with `%s'...%s" cmd
+         (message "Opening TLS connection with `%s'...%s" formatted-cmd
                   (if done "done" "failed"))
          (if (not done)
              (delete-process process)