From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sat, 19 Oct 2019 08:54:09 +0000 (+0200)
Subject: Remove some compat code in imap.el
X-Git-Tag: emacs-27.0.90~992
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=842518a0dbc1f84705784f9a34ab9dd2cf29015e;p=emacs.git

Remove some compat code in imap.el

* lisp/net/imap.el (imap-sasl-auth-p): Remove old-Emacs compat code.
---

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."