diff options
| author | Teodor Zlatanov | 2011-03-13 20:50:07 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka | 2011-03-13 20:50:07 +0000 |
| commit | 67613d3160cd9e87daabfb036828ceb5325d889b (patch) | |
| tree | f79291f57a716e7fcbfcc525f8aebe979deb90b6 | |
| parent | d251f04bea68e68d2598f0aa7464ecc26b26103e (diff) | |
| download | emacs-67613d3160cd9e87daabfb036828ceb5325d889b.tar.gz emacs-67613d3160cd9e87daabfb036828ceb5325d889b.zip | |
auth-source.el (auth-source-netrc-create): Show the default in the prompt when prompting for token creation.
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/auth-source.el | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index ec12faada98..af0bd1519c7 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-03-13 Teodor Zlatanov <tzz@lifelogs.com> | ||
| 2 | |||
| 3 | * auth-source.el (auth-source-netrc-create): Show the default in the | ||
| 4 | prompt when prompting for token creation. | ||
| 5 | |||
| 1 | 2011-03-12 Teodor Zlatanov <tzz@lifelogs.com> | 6 | 2011-03-12 Teodor Zlatanov <tzz@lifelogs.com> |
| 2 | 7 | ||
| 3 | * auth-source.el (auth-source-format-prompt): Always convert the value | 8 | * auth-source.el (auth-source-format-prompt): Always convert the value |
diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el index 0fb153ad09b..52f2b92e933 100644 --- a/lisp/gnus/auth-source.el +++ b/lisp/gnus/auth-source.el | |||
| @@ -1100,6 +1100,10 @@ See `auth-source-search' for details on SPEC." | |||
| 1100 | ;; special case prompt for passwords | 1100 | ;; special case prompt for passwords |
| 1101 | (read-passwd prompt)) | 1101 | (read-passwd prompt)) |
| 1102 | ((null data) | 1102 | ((null data) |
| 1103 | (when default | ||
| 1104 | (setq | ||
| 1105 | prompt | ||
| 1106 | (concat prompt (format "(default %s) " default)))) | ||
| 1103 | (read-string prompt nil nil default)) | 1107 | (read-string prompt nil nil default)) |
| 1104 | (t (or data default)))) | 1108 | (t (or data default)))) |
| 1105 | 1109 | ||