diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2020-08-27 14:46:27 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2020-08-27 14:46:27 +0200 |
| commit | 19bff57f609854f257780f20043e96fb2eddc713 (patch) | |
| tree | a8ab9b65c6385110634dbe2341f4112b0daa4d67 /lisp/minibuf-eldef.el | |
| parent | 6a95676cce0c4fa634f11f7f7679077063983f6c (diff) | |
| download | emacs-19bff57f609854f257780f20043e96fb2eddc713.tar.gz emacs-19bff57f609854f257780f20043e96fb2eddc713.tar.bz2 emacs-19bff57f609854f257780f20043e96fb2eddc713.zip | |
Make minibuf-eldef respect minibuffer-default-prompt-format
* lisp/minibuf-eldef.el (minibuffer-default--in-prompt-regexps):
Take minibuffer-default-prompt-format into account.
Diffstat (limited to 'lisp/minibuf-eldef.el')
| -rw-r--r-- | lisp/minibuf-eldef.el | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/lisp/minibuf-eldef.el b/lisp/minibuf-eldef.el index 01672c027f0..a32d21abb30 100644 --- a/lisp/minibuf-eldef.el +++ b/lisp/minibuf-eldef.el @@ -36,10 +36,24 @@ (defvar minibuffer-eldef-shorten-default) (defun minibuffer-default--in-prompt-regexps () - `(("\\( (default\\(?: is\\)? \\(.*\\))\\):? \\'" - 1 ,(if minibuffer-eldef-shorten-default " [\\2]")) - ("([^(]+?\\(, default\\(?: is\\)? \\(.*\\)\\)):? \\'" 1) - ("\\( \\[.*\\]\\):? *\\'" 1))) + (cons + (list + (concat + "\\(" + (if (string-match "%s" minibuffer-default-prompt-format) + (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) + `(("\\( (default\\(?: is\\)? \\(.*\\))\\):? \\'" + 1 ,(if minibuffer-eldef-shorten-default " [\\2]")) + ("([^(]+?\\(, default\\(?: is\\)? \\(.*\\)\\)):? \\'" 1) + ("\\( \\[.*\\]\\):? *\\'" 1)))) (defcustom minibuffer-eldef-shorten-default nil "If non-nil, shorten \"(default ...)\" to \"[...]\" in minibuffer prompts." |