X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/21fa24820007018632b3719ac6855eef6b688852..3698c4e475fb59730626af5d001599785ef5ef9e:/lisp/minibuf-eldef.el diff --git a/lisp/minibuf-eldef.el b/lisp/minibuf-eldef.el index 950c28b227..76ae11e3c6 100644 --- a/lisp/minibuf-eldef.el +++ b/lisp/minibuf-eldef.el @@ -1,6 +1,6 @@ ;;; minibuf-eldef.el --- Only show defaults in prompts when applicable -*- lexical-binding: t -*- ;; -;; Copyright (C) 2000-2012 Free Software Foundation, Inc. +;; Copyright (C) 2000-2016 Free Software Foundation, Inc. ;; ;; Author: Miles Bader ;; Keywords: convenience @@ -38,6 +38,7 @@ (defun minibuffer-default--in-prompt-regexps () `(("\\( (default\\(?: is\\)? \\(.*\\))\\):? \\'" 1 ,(if minibuffer-eldef-shorten-default " [\\2]")) + ("([^(]+?\\(, default\\(?: is\\)? \\(.*\\)\\)):? \\'" 1) ("\\( \\[.*\\]\\):? *\\'" 1))) (defcustom minibuffer-eldef-shorten-default nil @@ -152,15 +153,11 @@ been set up by `minibuf-eldef-setup-minibuffer'." (and (= (point-max) minibuf-eldef-initial-buffer-length) (string-equal (minibuffer-contents-no-properties) minibuf-eldef-initial-input))) - ;; swap state + ;; Swap state. (setq minibuf-eldef-showing-default-in-prompt (not minibuf-eldef-showing-default-in-prompt)) - (cond (minibuf-eldef-showing-default-in-prompt - (overlay-put minibuf-eldef-overlay 'invisible nil) - (overlay-put minibuf-eldef-overlay 'intangible nil)) - (t - (overlay-put minibuf-eldef-overlay 'invisible t) - (overlay-put minibuf-eldef-overlay 'intangible t))))) + (overlay-put minibuf-eldef-overlay 'invisible + (not minibuf-eldef-showing-default-in-prompt)))) ;;;###autoload