master e52f2ec 3/3: Remove Emacs 21 compat code from sasl.el

[Stefan Kangas]

branch: master
commit e52f2ec968a73a3f29939cf62d67a5ffe811ee09
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    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.
---
 lisp/net/sasl.el | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/lisp/net/sasl.el b/lisp/net/sasl.el
index 7f0431a..d2e08f7 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 ()