diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/minibuf-eldef.el | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c0a91bb75dc..2878db6271f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-02-10 Christopher Schmidt <christopher@ch.ristopher.com> | ||
| 2 | |||
| 3 | * minibuf-eldef.el (minibuffer-default--in-prompt-regexps): Handle | ||
| 4 | "foo (bar, default: xxx): " prompts. | ||
| 5 | |||
| 1 | 2013-02-10 Chong Yidong <cyd@gnu.org> | 6 | 2013-02-10 Chong Yidong <cyd@gnu.org> |
| 2 | 7 | ||
| 3 | * files.el (basic-save-buffer-1): Do not set | 8 | * files.el (basic-save-buffer-1): Do not set |
diff --git a/lisp/minibuf-eldef.el b/lisp/minibuf-eldef.el index 3826a91f0e0..3b59a9c622a 100644 --- a/lisp/minibuf-eldef.el +++ b/lisp/minibuf-eldef.el | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | (defun minibuffer-default--in-prompt-regexps () | 38 | (defun minibuffer-default--in-prompt-regexps () |
| 39 | `(("\\( (default\\(?: is\\)? \\(.*\\))\\):? \\'" | 39 | `(("\\( (default\\(?: is\\)? \\(.*\\))\\):? \\'" |
| 40 | 1 ,(if minibuffer-eldef-shorten-default " [\\2]")) | 40 | 1 ,(if minibuffer-eldef-shorten-default " [\\2]")) |
| 41 | ("([^(]+?\\(, default\\(?: is\\)? \\(.*\\)\\)):? \\'" 1) | ||
| 41 | ("\\( \\[.*\\]\\):? *\\'" 1))) | 42 | ("\\( \\[.*\\]\\):? *\\'" 1))) |
| 42 | 43 | ||
| 43 | (defcustom minibuffer-eldef-shorten-default nil | 44 | (defcustom minibuffer-eldef-shorten-default nil |