HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make heredocs more robust in Tramp.
[bpt/emacs.git]
/
lisp
/
net
/
tls.el
diff --git
a/lisp/net/tls.el
b/lisp/net/tls.el
index
7fc314e
..
8d7c695
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
;;; tls.el --- TLS/SSL support via wrapper around GnuTLS
-;; Copyright (C) 1996-1999, 2002-201
3
Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2002-201
4
Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon@josefsson.org>
;; Keywords: comm, tls, gnutls, ssl
;; Author: Simon Josefsson <simon@josefsson.org>
;; Keywords: comm, tls, gnutls, ssl
@@
-168,8
+168,8
@@
this to nil if you want to ignore host name mismatches."
:version "23.1" ;; No Gnus
:group 'tls)
:version "23.1" ;; No Gnus
:group 'tls)
-(defcustom tls-certtool-program
(executable-find "certtool")
- "Name of
GnuTLS certtool.
+(defcustom tls-certtool-program
"certtool"
+ "Name of GnuTLS certtool.
Used by `tls-certificate-information'."
:version "22.1"
:type 'string
Used by `tls-certificate-information'."
:version "22.1"
:type 'string
@@
-286,7
+286,10
@@
NOT trusted. Accept anyway? " host)))))
(format "Host name in certificate doesn't \
match `%s'. Connect anyway? " host))))))
(setq done nil)
(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
(message "Opening TLS connection to `%s'...%s"
host (if done "done" "failed"))
(when use-temp-buffer