From: Stefan Kangas <stefan@marxist.se>
Date: Fri, 29 Jan 2021 03:43:57 +0000 (+0100)
Subject: Remove Emacs 21 compat code from sasl.el
X-Git-Tag: emacs-28.0.90~4057
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e52f2ec968a73a3f29939cf62d67a5ffe811ee09;p=emacs.git

Remove Emacs 21 compat code from sasl.el

* lisp/net/sasl.el (sasl-read-passphrase): Remove compat code;
'read-passwd' is preloaded since Emacs 22.
---

diff --git a/lisp/net/sasl.el b/lisp/net/sasl.el
index 7f0431afb60..d2e08f7e3ed 100644
--- a/lisp/net/sasl.el
+++ b/lisp/net/sasl.el
@@ -161,15 +161,8 @@ the current challenge.  At the first time STEP should be set to nil."
     (if function
 	(vector function (funcall function client step)))))
 
-(defvar sasl-read-passphrase nil)
+(defvar sasl-read-passphrase 'read-passwd)
 (defun sasl-read-passphrase (prompt)
-  (if (not sasl-read-passphrase)
-      (if (functionp 'read-passwd)
-	  (setq sasl-read-passphrase 'read-passwd)
-	(if (load "passwd" t)
-	    (setq sasl-read-passphrase 'read-passwd)
-	  (autoload 'ange-ftp-read-passwd "ange-ftp")
-	  (setq sasl-read-passphrase 'ange-ftp-read-passwd))))
   (funcall sasl-read-passphrase prompt))
 
 (defun sasl-unique-id ()