diff options
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/auth-source.el | 11 |
2 files changed, 10 insertions, 6 deletions
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 @@ | |||
| 1 | 2011-02-23 Teodor Zlatanov <tzz@lifelogs.com> | ||
| 2 | |||
| 3 | * auth-source.el (auth-source-netrc-create): Use `read-char' instead of | ||
| 4 | `read-char-choice' for backwards compatibility. | ||
| 5 | |||
| 1 | 2011-02-23 Lars Ingebrigtsen <larsi@gnus.org> | 6 | 2011-02-23 Lars Ingebrigtsen <larsi@gnus.org> |
| 2 | 7 | ||
| 3 | * gnus-start.el (gnus-dribble-read-file): Set | 8 | * 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." | |||
| 1011 | (goto-char (point-max)) | 1011 | (goto-char (point-max)) |
| 1012 | 1012 | ||
| 1013 | ;; ask AFTER we've successfully opened the file | 1013 | ;; ask AFTER we've successfully opened the file |
| 1014 | (let (done k) | 1014 | (let ((prompt (format "Add to file %s? %s: " |
| 1015 | file | ||
| 1016 | "(y)es/(n)o but use it/(e)dit line/(s)kip file")) | ||
| 1017 | done k) | ||
| 1015 | (while (not done) | 1018 | (while (not done) |
| 1016 | (setq k (read-char-choice | 1019 | (setq k (read-char prompt)) |
| 1017 | (format "Add to file %s? %s: " | ||
| 1018 | file | ||
| 1019 | "(y)es/(n)o but use it/(e)dit line/(s)kip file") | ||
| 1020 | '(?y ?n ?e ?s))) | ||
| 1021 | (case k | 1020 | (case k |
| 1022 | (?y (setq done t)) | 1021 | (?y (setq done t)) |
| 1023 | (?n (setq add "" | 1022 | (?n (setq add "" |