Use read-char instead of read-char-choice.

* auth-source.el (auth-source-netrc-create): Use `read-char' instead of
`read-char-choice' for backwards compatibility.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d7b63cf..b3f9a24 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-23  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * auth-source.el (auth-source-netrc-create): Use `read-char' instead of
+       `read-char-choice' for backwards compatibility.
+
 2011-02-23  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-start.el (gnus-dribble-read-file): Set

diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 59b5ebb..79f97f8 100644 (file)
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -1021,13 +1021,12 @@ See `auth-source-search' for details on SPEC."
       (goto-char (point-max))
 
       ;; ask AFTER we've successfully opened the file
-      (let (done k)
+      (let ((prompt (format "Add to file %s? %s: "
+                            file
+                            "(y)es/(n)o but use it/(e)dit line/(s)kip file"))
+            done k)
         (while (not done)
-          (setq k (read-char-choice
-                   (format "Add to file %s? %s: "
-                           file
-                           "(y)es/(n)o but use it/(e)dit line/(s)kip file")
-                   '(?y ?n ?e ?s)))
+          (setq k (read-char prompt))
           (case k
             (?y (setq done t))
             (?n (setq add ""