From 842518a0dbc1f84705784f9a34ab9dd2cf29015e Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Sat, 19 Oct 2019 10:54:09 +0200 Subject: [PATCH] Remove some compat code in imap.el * lisp/net/imap.el (imap-sasl-auth-p): Remove old-Emacs compat code. --- lisp/net/imap.el | 6 ++---- 1 file 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." (declare-function sasl-step-set-data "sasl" (step data)) (defun imap-sasl-auth-p (buffer) - (and (condition-case () - (require 'sasl) - (error nil)) - (sasl-find-mechanism (imap-sasl-make-mechanisms buffer)))) + (require 'sasl) + (sasl-find-mechanism (imap-sasl-make-mechanisms buffer))) (defun imap-sasl-auth (buffer) "Login to server using the SASL method." -- 2.39.2