Don't use the dropdown-list library.

* auth-source.el (auth-source-read-char-choice): Remove `dropdown-list'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 96d521b..ee21234 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,7 +4,7 @@
        character choice using `dropdown-list', `read-char-choice', or
        `read-char'.  It appends "[a/b/c] " to the prompt if the choices were
        '(?a ?b ?c).  The `dropdown-list' support is disabled for now.  Use
-       `eval-when-compile' to load `dropdown-list'.
+       `eval-when-compile' to load `dropdown-list'.  Remove `dropdown-list'.
        (auth-source-netrc-saver): Use it.
        (auth-source-pick-first-password): New convenience function.
 

diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index e2a3ce5..fff0356 100644 (file)
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -44,7 +44,6 @@
 (require 'gnus-util)
 (require 'assoc)
 (eval-when-compile (require 'cl))
-(eval-when-compile (require 'dropdown-list nil t))
 (eval-and-compile
   (or (ignore-errors (require 'eieio))
       ;; gnus-fallback-lib/ from gnus/lisp/gnus-fallback-lib
@@ -313,12 +312,6 @@ with \"[a/b/c] \" if CHOICES is '\(?a ?b ?c\)."
 
       (while (not (memq k choices))
         (setq k (cond
-                 ((and nil (featurep 'dropdown-list))
-                  (let* ((blank (fill (copy-sequence prompt) ?.))
-                         (dlc (cons (format "%s %c" prompt (car choices))
-                                    (loop for c in (cdr choices)
-                                          collect (format "%s %c" blank c)))))
-                    (nth (dropdown-list dlc) choices)))
                  ((fboundp 'read-char-choice)
                   (read-char-choice full-prompt choices))
                  (t (message "%s" full-prompt)