diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-11-08 04:43:38 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-11-08 04:43:38 +0800 |
| commit | 7d806bfec978fbc99c95797e4f236daa44c44007 (patch) | |
| tree | ba7db25273d10f41d1a1822a0fbb80d32f446d11 /lisp/minibuf-eldef.el | |
| parent | 8a3afaf9ea1812d8c341ea27744d68441f3ce5a5 (diff) | |
| download | emacs-7d806bfec978fbc99c95797e4f236daa44c44007.tar.gz | |
Fix and docfix for the minibuffer-eldef-shorten-default feature.
* lisp/minibuf-eldef.el (minibuffer-eldef-shorten-default): Convert to
a defcustom with an appropriate :set function.
(minibuffer-default--in-prompt-regexps): New function.
* doc/emacs/mini.texi (Basic Minibuffer): New node. Document
minibuffer-electric-default-mode.
* doc/emacs/display.texi (Visual Line Mode): Fix index entry.
Diffstat (limited to 'lisp/minibuf-eldef.el')
| -rw-r--r-- | lisp/minibuf-eldef.el | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/lisp/minibuf-eldef.el b/lisp/minibuf-eldef.el index 92d5ec821b0..950c28b227f 100644 --- a/lisp/minibuf-eldef.el +++ b/lisp/minibuf-eldef.el @@ -33,13 +33,25 @@ ;;; Code: -(defvar minibuffer-eldef-shorten-default nil - "If non-nil, shorten \"(default ...)\" to \"[...]\" in minibuffer prompts.") +(defvar minibuffer-eldef-shorten-default) -(defvar minibuffer-default-in-prompt-regexps +(defun minibuffer-default--in-prompt-regexps () `(("\\( (default\\(?: is\\)? \\(.*\\))\\):? \\'" 1 ,(if minibuffer-eldef-shorten-default " [\\2]")) - ("\\( \\[.*\\]\\):? *\\'" 1)) + ("\\( \\[.*\\]\\):? *\\'" 1))) + +(defcustom minibuffer-eldef-shorten-default nil + "If non-nil, shorten \"(default ...)\" to \"[...]\" in minibuffer prompts." + :set (lambda (symbol value) + (set-default symbol value) + (setq-default minibuffer-default-in-prompt-regexps + (minibuffer-default--in-prompt-regexps))) + :type 'boolean + :group 'minibuffer + :version "24.3") + +(defvar minibuffer-default-in-prompt-regexps + (minibuffer-default--in-prompt-regexps) "A list of regexps matching the parts of minibuffer prompts showing defaults. When `minibuffer-electric-default-mode' is active, these regexps are used to identify the portions of prompts to elide. |