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).

diff --git a/lisp/minibuf-eldef.el b/lisp/minibuf-eldef.el
index 6cd858093cd2ebe01afe7de514a95c49b1b30761..363899d265675ed651a25255ed2d4cd8a402a668 100644 (file)
--- 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)