aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kangas2021-01-29 04:43:57 +0100
committerStefan Kangas2021-01-29 06:19:06 +0100
commite52f2ec968a73a3f29939cf62d67a5ffe811ee09 (patch)
tree42aecf28f5e72d7320d291984fbdc1dfd01c8cb5
parenta27512e21c710ab39a0b811701a952db482204c1 (diff)
downloademacs-e52f2ec968a73a3f29939cf62d67a5ffe811ee09.tar.gz
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.el9
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."
161 (if function 161 (if function
162 (vector function (funcall function client step))))) 162 (vector function (funcall function client step)))))
163 163
164(defvar sasl-read-passphrase nil) 164(defvar sasl-read-passphrase 'read-passwd)
165(defun sasl-read-passphrase (prompt) 165(defun sasl-read-passphrase (prompt)
166 (if (not sasl-read-passphrase)
167 (if (functionp 'read-passwd)
168 (setq sasl-read-passphrase 'read-passwd)
169 (if (load "passwd" t)
170 (setq sasl-read-passphrase 'read-passwd)
171 (autoload 'ange-ftp-read-passwd "ange-ftp")
172 (setq sasl-read-passphrase 'ange-ftp-read-passwd))))
173 (funcall sasl-read-passphrase prompt)) 166 (funcall sasl-read-passphrase prompt))
174 167
175(defun sasl-unique-id () 168(defun sasl-unique-id ()