diff options
-rw-r--r-- | lisp/ChangeLog | 7 | ||||
-rw-r--r-- | lisp/net/tls.el | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 106d73ec206..006bb9d9fe6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2013-06-05 Teodor Zlatanov <tzz@lifelogs.com> + + * net/tls.el (open-tls-stream): Remove unneeded buffer contents up + to point when opening the connection. + Suggested by João Távora <joaotavora@gmail.com> in + <http://lists.gnu.org/archive/html/emacs-devel/2013-05/msg00464.html>. + 2013-06-05 Stefan Monnier <monnier@iro.umontreal.ca> * subr.el (load-history-regexp, load-history-filename-element) diff --git a/lisp/net/tls.el b/lisp/net/tls.el index 7fc314ef088..3d8d8decf47 100644 --- a/lisp/net/tls.el +++ b/lisp/net/tls.el @@ -286,7 +286,10 @@ NOT trusted. Accept anyway? " host))))) (format "Host name in certificate doesn't \ match `%s'. Connect anyway? " host)))))) (setq done nil) - (delete-process process))) + (delete-process process)) + ;; Delete all the informational messages that could confuse + ;; future uses of `buffer'. + (delete-region (point-min) (point))) (message "Opening TLS connection to `%s'...%s" host (if done "done" "failed")) (when use-temp-buffer |