summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2020-09-14 13:14:21 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2020-09-14 13:14:21 +0200
commit7cc161433832e6a518701d2b47fef7b298dc4a0a (patch)
tree69b76533e1f4f9e4cd078c59e68a91e1ce18dc10
parentb40a7056e53afd9d4ffdac03fd7b1b0fabb2a85d (diff)
downloademacs-7cc161433832e6a518701d2b47fef7b298dc4a0a.tar.gz
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).
-rw-r--r--lisp/minibuf-eldef.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/minibuf-eldef.el b/lisp/minibuf-eldef.el
index 6cd858093cd..363899d2656 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)