aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2019-10-19 10:54:09 +0200
committerLars Ingebrigtsen2019-10-19 10:54:09 +0200
commit842518a0dbc1f84705784f9a34ab9dd2cf29015e (patch)
tree7a715d449bbb4d132b40ea948a11fe3afebdf0b2
parentfc6de411a7afeeb197eef0a23b83a5ea9a14bbc6 (diff)
downloademacs-842518a0dbc1f84705784f9a34ab9dd2cf29015e.tar.gz
emacs-842518a0dbc1f84705784f9a34ab9dd2cf29015e.zip
Remove some compat code in imap.el
* lisp/net/imap.el (imap-sasl-auth-p): Remove old-Emacs compat code.
-rw-r--r--lisp/net/imap.el6
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/net/imap.el b/lisp/net/imap.el
index 71d19185ff3..4601e84b22e 100644
--- a/lisp/net/imap.el
+++ b/lisp/net/imap.el
@@ -904,10 +904,8 @@ t if it successfully authenticates, nil otherwise."
904(declare-function sasl-step-set-data "sasl" (step data)) 904(declare-function sasl-step-set-data "sasl" (step data))
905 905
906(defun imap-sasl-auth-p (buffer) 906(defun imap-sasl-auth-p (buffer)
907 (and (condition-case () 907 (require 'sasl)
908 (require 'sasl) 908 (sasl-find-mechanism (imap-sasl-make-mechanisms buffer)))
909 (error nil))
910 (sasl-find-mechanism (imap-sasl-make-mechanisms buffer))))
911 909
912(defun imap-sasl-auth (buffer) 910(defun imap-sasl-auth (buffer)
913 "Login to server using the SASL method." 911 "Login to server using the SASL method."