[Emacs-diffs] /srv/bzr/emacs/trunk r103403: auth-source.el (auth-source-netrc-create): Use `read-char' instead of `read-char-choice' for backwards compatibility.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 103403
author: Teodor Zlatanov <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2011-02-23 14:34:44 +0000
message:
  auth-source.el (auth-source-netrc-create): Use `read-char' instead of 
`read-char-choice' for backwards compatibility.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/auth-source.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-02-23 13:35:35 +0000
+++ b/lisp/gnus/ChangeLog       2011-02-23 14:34:44 +0000
@@ -1,3 +1,8 @@
+2011-02-23  Teodor Zlatanov  <address@hidden>
+
+       * auth-source.el (auth-source-netrc-create): Use `read-char' instead of
+       `read-char-choice' for backwards compatibility.
+
 2011-02-23  Lars Ingebrigtsen  <address@hidden>
 
        * gnus-start.el (gnus-dribble-read-file): Set

=== modified file 'lisp/gnus/auth-source.el'
--- a/lisp/gnus/auth-source.el  2011-02-23 13:35:35 +0000
+++ b/lisp/gnus/auth-source.el  2011-02-23 14:34:44 +0000
@@ -1011,13 +1011,12 @@
       (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 ""