diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-02-06 22:23:54 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-02-06 22:23:54 -0800 |
| commit | 8c4b24b2ab14be6d33d4e979f3de6fb85eff6518 (patch) | |
| tree | 836d8403be35fe8842cdcbd72b0bf7a232257bc6 /lisp/gnus | |
| parent | 925baaa91d731fba2d3d9bf16c8af29735f1999c (diff) | |
| parent | e364bc673cfb92194c7d4a034e3c65ea9137d7ff (diff) | |
| download | emacs-8c4b24b2ab14be6d33d4e979f3de6fb85eff6518.tar.gz | |
Merge from emacs-24; up to 2012-12-14T15:22:24Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/auth-source.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 7cb278f2a6f..56ec2ed50c8 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2013-02-07 Gábor Vida <gabor.v.vida@ericsson.com> (tiny change) + + * auth-source.el (auth-source-format-prompt): Don't get confused by + any "\" in replacement text. (Bug#13637) + 2013-01-30 Christopher Schmidt <christopher@ch.ristopher.com> * gnus-int.el (gnus-backend-trace-elapsed): New variable. diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el index ac16200adb2..e94904bf175 100644 --- a/lisp/gnus/auth-source.el +++ b/lisp/gnus/auth-source.el @@ -913,7 +913,7 @@ while \(:host t) would find all host entries." (when (and c v) (setq prompt (replace-regexp-in-string (format "%%%c" c) (format "%s" v) - prompt))))) + prompt nil t))))) prompt) (defun auth-source-ensure-strings (values) |