summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorTed Zlatanov <tzz@lifelogs.com>2013-06-05 11:03:37 -0400
committerTed Zlatanov <tzz@lifelogs.com>2013-06-05 11:03:37 -0400
commit28f5da6df34eb64677e25afd001c1f48b012aec7 (patch)
tree3397800bfe14bfaf5805efa8c9934679fcf6316d /lisp
parent781b4af61d662b0a67989776c9f281d7bd4b26ac (diff)
downloademacs-28f5da6df34eb64677e25afd001c1f48b012aec7.tar.gz
emacs-28f5da6df34eb64677e25afd001c1f48b012aec7.tar.bz2
emacs-28f5da6df34eb64677e25afd001c1f48b012aec7.zip
(open-tls-stream): Remove unneeded buffer contents when opening the connection.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/net/tls.el5
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