From: Teodor Zlatanov <tzz@lifelogs.com>
Date: Wed, 23 Feb 2011 14:34:44 +0000 (+0000)
Subject: auth-source.el (auth-source-netrc-create): Use `read-char' instead of `read-char... 
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~747
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d41d18c098709249cb44dcf4bc5fcf8ed4057f29;p=emacs.git

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

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index c31c2767458..0d8dfe0ea91 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/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/gnus/auth-source.el b/lisp/gnus/auth-source.el
index 093012df535..d349022e7b7 100644
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -1011,13 +1011,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 ""