diff options
| author | Stefan Kangas <stefan@marxist.se> | 2021-01-29 04:43:57 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2021-01-29 06:19:06 +0100 |
| commit | e52f2ec968a73a3f29939cf62d67a5ffe811ee09 (patch) | |
| tree | 42aecf28f5e72d7320d291984fbdc1dfd01c8cb5 | |
| parent | a27512e21c710ab39a0b811701a952db482204c1 (diff) | |
| download | emacs-e52f2ec968a73a3f29939cf62d67a5ffe811ee09.tar.gz emacs-e52f2ec968a73a3f29939cf62d67a5ffe811ee09.tar.bz2 emacs-e52f2ec968a73a3f29939cf62d67a5ffe811ee09.zip | |
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.
| -rw-r--r-- | lisp/net/sasl.el | 9 |
1 files changed, 1 insertions, 8 deletions
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 () |