master 7cc1614: Further fixups in minibuffer-default--in-prompt-regexps

[Lars Ingebrigtsen]

branch: master
commit 7cc161433832e6a518701d2b47fef7b298dc4a0a
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Further fixups in minibuffer-default--in-prompt-regexps
    
    * lisp/minibuf-eldef.el (minibuffer-default--in-prompt-regexps):
    Really allow shortening the default prompt format to [foo] (if
    requested) (bug#12443).
---
 lisp/minibuf-eldef.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/minibuf-eldef.el b/lisp/minibuf-eldef.el
index 6cd8580..363899d 100644
--- a/lisp/minibuf-eldef.el
+++ b/lisp/minibuf-eldef.el
@@ -44,12 +44,12 @@
          (concat
           (regexp-quote (substring minibuffer-default-prompt-format
                                    0 (match-beginning 0)))
-          ".*"
+          "\\(.*?\\)"
           (regexp-quote (substring minibuffer-default-prompt-format
                                    (match-end 0))))
        (regexp-quote minibuffer-default-prompt-format))
      "\\): ")
-    1)
+    1 (and minibuffer-eldef-shorten-default " [\\2]"))
    `(("\\( (default\\(?: is\\)? \\(.*\\))\\):? \\'"
       1 ,(if minibuffer-eldef-shorten-default " [\\2]"))
      ("([^(]+?\\(, default\\(?: is\\)? \\(.*\\)\\)):? \\'" 1)