summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2016-02-14 14:59:40 +1100
committerLars Ingebrigtsen <larsi@gnus.org>2016-02-14 14:59:40 +1100
commit19d298f7d7f672ecb1d58be372f401cdf3d86160 (patch)
tree8cfab257fef8ed96a5069afd059f284caf0bbb25
parent928bb3ff3e29c3a7b3449c11ecbb440e959b5b4f (diff)
downloademacs-19d298f7d7f672ecb1d58be372f401cdf3d86160.tar.gz
Remove compat functions from starttls.el
* lisp/gnus/starttls.el (starttls-set-process-query-on-exit-flag): Remove.
-rw-r--r--lisp/gnus/starttls.el11
1 files changed, 2 insertions, 9 deletions
diff --git a/lisp/gnus/starttls.el b/lisp/gnus/starttls.el
index f3ef5e023f9..096ed2adc0d 100644
--- a/lisp/gnus/starttls.el
+++ b/lisp/gnus/starttls.el
@@ -232,13 +232,6 @@ handshake, or nil on failure."
(starttls-negotiate-gnutls process)
(signal-process (process-id process) 'SIGALRM)))
-(eval-and-compile
- (if (fboundp 'set-process-query-on-exit-flag)
- (defalias 'starttls-set-process-query-on-exit-flag
- 'set-process-query-on-exit-flag)
- (defalias 'starttls-set-process-query-on-exit-flag
- 'process-kill-without-query)))
-
(defun starttls-open-stream-gnutls (name buffer host port)
(message "Opening STARTTLS connection to `%s:%s'..." host port)
(let* (done
@@ -250,7 +243,7 @@ handshake, or nil on failure."
(int-to-string port)
port)
starttls-extra-arguments)))
- (starttls-set-process-query-on-exit-flag process nil)
+ (set-process-query-on-exit-flag process nil)
(while (and (processp process)
(eq (process-status process) 'run)
(with-current-buffer buffer
@@ -292,7 +285,7 @@ GnuTLS requires a port number."
name buffer starttls-program
host (format "%s" port)
starttls-extra-args)))
- (starttls-set-process-query-on-exit-flag process nil)
+ (set-process-query-on-exit-flag process nil)
process)))
(defun starttls-available-p ()