projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://git.gnus.org/gnus
[gnus]
/
lisp
/
starttls.el
diff --git
a/lisp/starttls.el
b/lisp/starttls.el
index
d47daff
..
4b4839a
100644
(file)
--- a/
lisp/starttls.el
+++ b/
lisp/starttls.el
@@
-1,7
+1,6
@@
;;; starttls.el --- STARTTLS functions
;;; starttls.el --- STARTTLS functions
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011 Free Software Foundation, Inc.
;; Author: Daiki Ueno <ueno@unixuser.org>
;; Author: Simon Josefsson <simon@josefsson.org>
;; Author: Daiki Ueno <ueno@unixuser.org>
;; Author: Simon Josefsson <simon@josefsson.org>
@@
-254,8
+253,7
@@
handshake, or nil on failure."
(starttls-set-process-query-on-exit-flag process nil)
(while (and (processp process)
(eq (process-status process) 'run)
(starttls-set-process-query-on-exit-flag process nil)
(while (and (processp process)
(eq (process-status process) 'run)
- (save-excursion
- (set-buffer buffer)
+ (with-current-buffer buffer
(goto-char old-max)
(not (setq done (re-search-forward
starttls-connect nil t)))))
(goto-char old-max)
(not (setq done (re-search-forward
starttls-connect nil t)))))
@@
-270,6
+268,7
@@
handshake, or nil on failure."
host port (if done "done" "failed"))
process))
host port (if done "done" "failed"))
process))
+;;;###autoload
(defun starttls-open-stream (name buffer host port)
"Open a TLS connection for a port to a host.
Returns a subprocess object to represent the connection.
(defun starttls-open-stream (name buffer host port)
"Open a TLS connection for a port to a host.
Returns a subprocess object to represent the connection.
@@
-301,16
+300,14
@@
GNUTLS requires a port number."
starttls-gnutls-program
starttls-program)))
(condition-case ()
starttls-gnutls-program
starttls-program)))
(condition-case ()
- (with-no-warnings
- (require 'starttls)
+ (progn
(call-process program)
program)
(error (progn
(call-process program)
program)
(error (progn
- (message "No STARTTLS program was available (tried '%s')"
+ (message "No STARTTLS program was available (tried '%s')"
program)
nil)))))
(provide 'starttls)
program)
nil)))))
(provide 'starttls)
-;; arch-tag: 648b3bd8-63bd-47f5-904c-7c819aea2297
;;; starttls.el ends here
;;; starttls.el ends here