diff options
| author | Ted Zlatanov | 2013-06-05 11:03:37 -0400 |
|---|---|---|
| committer | Ted Zlatanov | 2013-06-05 11:03:37 -0400 |
| commit | 28f5da6df34eb64677e25afd001c1f48b012aec7 (patch) | |
| tree | 3397800bfe14bfaf5805efa8c9934679fcf6316d /lisp | |
| parent | 781b4af61d662b0a67989776c9f281d7bd4b26ac (diff) | |
| download | emacs-28f5da6df34eb64677e25afd001c1f48b012aec7.tar.gz emacs-28f5da6df34eb64677e25afd001c1f48b012aec7.zip | |
(open-tls-stream): Remove unneeded buffer contents when opening the connection.
Diffstat (limited to 'lisp')
| -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 @@ | |||
| 1 | 2013-06-05 Teodor Zlatanov <tzz@lifelogs.com> | ||
| 2 | |||
| 3 | * net/tls.el (open-tls-stream): Remove unneeded buffer contents up | ||
| 4 | to point when opening the connection. | ||
| 5 | Suggested by João Távora <joaotavora@gmail.com> in | ||
| 6 | <http://lists.gnu.org/archive/html/emacs-devel/2013-05/msg00464.html>. | ||
| 7 | |||
| 1 | 2013-06-05 Stefan Monnier <monnier@iro.umontreal.ca> | 8 | 2013-06-05 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 9 | ||
| 3 | * subr.el (load-history-regexp, load-history-filename-element) | 10 | * 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))))) | |||
| 286 | (format "Host name in certificate doesn't \ | 286 | (format "Host name in certificate doesn't \ |
| 287 | match `%s'. Connect anyway? " host)))))) | 287 | match `%s'. Connect anyway? " host)))))) |
| 288 | (setq done nil) | 288 | (setq done nil) |
| 289 | (delete-process process))) | 289 | (delete-process process)) |
| 290 | ;; Delete all the informational messages that could confuse | ||
| 291 | ;; future uses of `buffer'. | ||
| 292 | (delete-region (point-min) (point))) | ||
| 290 | (message "Opening TLS connection to `%s'...%s" | 293 | (message "Opening TLS connection to `%s'...%s" |
| 291 | host (if done "done" "failed")) | 294 | host (if done "done" "failed")) |
| 292 | (when use-temp-buffer | 295 | (when use-temp-buffer |