aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2015-12-26 21:47:20 +0100
committerLars Ingebrigtsen2015-12-26 21:47:39 +0100
commitb329958df604e84147e85e9b214fa52742c47183 (patch)
treeb1441ec0a27569da69abb92c644bc4771ae89300
parenta2158f6c9af62f11533b2086596b755781d2e34f (diff)
downloademacs-b329958df604e84147e85e9b214fa52742c47183.tar.gz
emacs-b329958df604e84147e85e9b214fa52742c47183.zip
* imap.el (imap-ssl-open): Remove
-rw-r--r--lisp/net/imap.el54
1 files changed, 1 insertions, 53 deletions
diff --git a/lisp/net/imap.el b/lisp/net/imap.el
index b25f30b5306..cc89f475bba 100644
--- a/lisp/net/imap.el
+++ b/lisp/net/imap.el
@@ -276,7 +276,7 @@ Shorter values mean quicker response, but is more CPU intensive."
276 '((gssapi imap-gssapi-stream-p imap-gssapi-open) 276 '((gssapi imap-gssapi-stream-p imap-gssapi-open)
277 (kerberos4 imap-kerberos4-stream-p imap-kerberos4-open) 277 (kerberos4 imap-kerberos4-stream-p imap-kerberos4-open)
278 (tls imap-tls-p imap-tls-open) 278 (tls imap-tls-p imap-tls-open)
279 (ssl imap-ssl-p imap-ssl-open) 279 (ssl imap-tls-p imap-tls-open)
280 (network imap-network-p imap-network-open) 280 (network imap-network-p imap-network-open)
281 (shell imap-shell-p imap-shell-open) 281 (shell imap-shell-p imap-shell-open)
282 (starttls imap-starttls-p imap-starttls-open)) 282 (starttls imap-starttls-p imap-starttls-open))
@@ -644,56 +644,6 @@ sure of changing the value of `foo'."
644 nil))))) 644 nil)))))
645 done)) 645 done))
646 646
647(defun imap-ssl-p (_buffer)
648 nil)
649
650(defun imap-ssl-open (name buffer server port)
651 "Open an SSL connection to SERVER."
652 (let ((cmds (if (listp imap-ssl-program) imap-ssl-program
653 (list imap-ssl-program)))
654 cmd done)
655 (while (and (not done) (setq cmd (pop cmds)))
656 (message "imap: Opening SSL connection with `%s'..." cmd)
657 (erase-buffer)
658 (let* ((port (or port imap-default-ssl-port))
659 (coding-system-for-read imap-coding-system-for-read)
660 (coding-system-for-write imap-coding-system-for-write)
661 (process-connection-type imap-process-connection-type)
662 (set-process-query-on-exit-flag
663 (if (fboundp 'set-process-query-on-exit-flag)
664 'set-process-query-on-exit-flag
665 'process-kill-without-query))
666 process)
667 (when (progn
668 (setq process (start-process
669 name buffer shell-file-name
670 shell-command-switch
671 (format-spec cmd
672 (format-spec-make
673 ?s server
674 ?p (number-to-string port)))))
675 (funcall set-process-query-on-exit-flag process nil)
676 process)
677 (with-current-buffer buffer
678 (goto-char (point-min))
679 (while (and (memq (process-status process) '(open run))
680 (set-buffer buffer) ;; XXX "blue moon" nntp.el bug
681 (goto-char (point-max))
682 (forward-line -1)
683 (not (imap-parse-greeting)))
684 (accept-process-output process 1)
685 (sit-for 1))
686 (imap-log buffer)
687 (erase-buffer)
688 (when (memq (process-status process) '(open run))
689 (setq done process))))))
690 (if done
691 (progn
692 (message "imap: Opening SSL connection with `%s'...done" cmd)
693 done)
694 (message "imap: Opening SSL connection with `%s'...failed" cmd)
695 nil)))
696
697(defun imap-tls-p (_buffer) 647(defun imap-tls-p (_buffer)
698 nil) 648 nil)
699 649
@@ -2939,8 +2889,6 @@ Return nil if no complete line has arrived."
2939 imap-error-text 2889 imap-error-text
2940 imap-kerberos4s-p 2890 imap-kerberos4s-p
2941 imap-kerberos4-open 2891 imap-kerberos4-open
2942 imap-ssl-p
2943 imap-ssl-open
2944 imap-network-p 2892 imap-network-p
2945 imap-network-open 2893 imap-network-open
2946 imap-interactive-login 2894 imap-interactive-login