diff options
| author | Magnus Henoch <mange@freemail.hu> | 2008-10-01 23:48:57 +0000 |
|---|---|---|
| committer | Magnus Henoch <mange@freemail.hu> | 2008-10-01 23:48:57 +0000 |
| commit | 8ed4a859771541b536e093af5f17d1174be0ac01 (patch) | |
| tree | 39b4dc834a49a4fa3c0a9b6d83e68920d16692fb /lisp | |
| parent | 8d0e382ee4161edb2a109fb14e3089a9169ca0ef (diff) | |
| download | emacs-8ed4a859771541b536e093af5f17d1174be0ac01.tar.gz emacs-8ed4a859771541b536e093af5f17d1174be0ac01.tar.bz2 emacs-8ed4a859771541b536e093af5f17d1174be0ac01.zip | |
net/tls.el (open-tls-stream): Show the actual command being executed,
instead of the format string.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/tls.el | 20 |
2 files changed, 16 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 28a7d514f4f..6eccc98dbe0 100644 --- 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 64d113ae28e..dadc4e6018a 100644 --- 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) |