aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2016-02-14 14:59:40 +1100
committerLars Ingebrigtsen2016-02-14 14:59:40 +1100
commit19d298f7d7f672ecb1d58be372f401cdf3d86160 (patch)
tree8cfab257fef8ed96a5069afd059f284caf0bbb25
parent928bb3ff3e29c3a7b3449c11ecbb440e959b5b4f (diff)
downloademacs-19d298f7d7f672ecb1d58be372f401cdf3d86160.tar.gz
emacs-19d298f7d7f672ecb1d58be372f401cdf3d86160.zip
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."
232 (starttls-negotiate-gnutls process) 232 (starttls-negotiate-gnutls process)
233 (signal-process (process-id process) 'SIGALRM))) 233 (signal-process (process-id process) 'SIGALRM)))
234 234
235(eval-and-compile
236 (if (fboundp 'set-process-query-on-exit-flag)
237 (defalias 'starttls-set-process-query-on-exit-flag
238 'set-process-query-on-exit-flag)
239 (defalias 'starttls-set-process-query-on-exit-flag
240 'process-kill-without-query)))
241
242(defun starttls-open-stream-gnutls (name buffer host port) 235(defun starttls-open-stream-gnutls (name buffer host port)
243 (message "Opening STARTTLS connection to `%s:%s'..." host port) 236 (message "Opening STARTTLS connection to `%s:%s'..." host port)
244 (let* (done 237 (let* (done
@@ -250,7 +243,7 @@ handshake, or nil on failure."
250 (int-to-string port) 243 (int-to-string port)
251 port) 244 port)
252 starttls-extra-arguments))) 245 starttls-extra-arguments)))
253 (starttls-set-process-query-on-exit-flag process nil) 246 (set-process-query-on-exit-flag process nil)
254 (while (and (processp process) 247 (while (and (processp process)
255 (eq (process-status process) 'run) 248 (eq (process-status process) 'run)
256 (with-current-buffer buffer 249 (with-current-buffer buffer
@@ -292,7 +285,7 @@ GnuTLS requires a port number."
292 name buffer starttls-program 285 name buffer starttls-program
293 host (format "%s" port) 286 host (format "%s" port)
294 starttls-extra-args))) 287 starttls-extra-args)))
295 (starttls-set-process-query-on-exit-flag process nil) 288 (set-process-query-on-exit-flag process nil)
296 process))) 289 process)))
297 290
298(defun starttls-available-p () 291(defun starttls-available-p ()