]> git.eshelyaron.com Git - emacs.git/commitdiff
Remove some compat code in imap.el
authorLars Ingebrigtsen <larsi@gnus.org>
Sat, 19 Oct 2019 08:54:09 +0000 (10:54 +0200)
committerLars Ingebrigtsen <larsi@gnus.org>
Sat, 19 Oct 2019 08:54:09 +0000 (10:54 +0200)
* lisp/net/imap.el (imap-sasl-auth-p): Remove old-Emacs compat code.

lisp/net/imap.el

index 71d19185ff3497ad14e5f1b4f93deeeb8c5564aa..4601e84b22e2db13689a5da4807370bb5e4c9343 100644 (file)
@@ -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."