* net/dbus.el (dbus-byte-array-to-string): Accept also byte arrays

[gnu-emacs] / lisp / net / tls.el

diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index 116c7e9d84a8fecf7fd540992a74910edffcb204..3d8d8decf47448a942ea0f8b75df55a5558bb109 100644 (file)
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -1,6 +1,6 @@
 ;;; tls.el --- TLS/SSL support via wrapper around GnuTLS
 
-;; Copyright (C) 1996-1999, 2002-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2002-2013 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: comm, tls, gnutls, ssl
@@ -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