diff options
| author | Juri Linkov <juri@linkov.net> | 2019-07-05 01:01:01 +0300 |
|---|---|---|
| committer | Juri Linkov <juri@linkov.net> | 2019-07-05 01:01:01 +0300 |
| commit | 44f199648b0c986a0ac7608f4e9d803c619ae2d6 (patch) | |
| tree | fe96158d4d64d8e91274cbd88b56ff6fa12011e6 /lisp/isearch.el | |
| parent | 19b1cefa3ba00ea383bd0910523c6e972fedbe02 (diff) | |
| download | emacs-44f199648b0c986a0ac7608f4e9d803c619ae2d6.tar.gz | |
* lisp/minibuffer.el (minibuffer-message-properties): New variable.
(minibuffer-message): Use it to propertize message unless already
propertized by the caller.
* lisp/simple.el (minibuffer-error-function): Propertize the error.
* lisp/isearch.el (isearch-message-properties): New variable.
(isearch--momentary-message, isearch-message-prefix)
(isearch-message-suffix): Use it. (Bug#21112)
Diffstat (limited to 'lisp/isearch.el')
| -rw-r--r-- | lisp/isearch.el | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el index f150a3bba4b..94c30eb57be 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -1992,13 +1992,17 @@ Turning on character-folding turns off regexp mode.") (setq isearch-regexp (not isearch-regexp)) (if isearch-regexp (setq isearch-regexp-function nil))) +(defvar isearch-message-properties minibuffer-prompt-properties + "Text properties that are added to the isearch prompt.") + (defun isearch--momentary-message (string) "Print STRING at the end of the isearch prompt for 1 second" (let ((message-log-max nil)) (message "%s%s%s" (isearch-message-prefix nil isearch-nonincremental) isearch-message - (propertize (format " [%s]" string) 'face 'minibuffer-prompt))) + (apply #'propertize (format " [%s]" string) + isearch-message-properties))) (sit-for 1)) (isearch-define-mode-toggle lax-whitespace " " nil @@ -3202,18 +3206,18 @@ the word mode." (concat " [" current-input-method-title "]: ")) ": ") ))) - (propertize (concat (isearch-lazy-count-format) + (apply #'propertize (concat (isearch-lazy-count-format) (upcase (substring m 0 1)) (substring m 1)) - 'face 'minibuffer-prompt))) + isearch-message-properties))) (defun isearch-message-suffix (&optional c-q-hack) - (propertize (concat (if c-q-hack "^Q" "") + (apply #'propertize (concat (if c-q-hack "^Q" "") (isearch-lazy-count-format 'suffix) (if isearch-error (concat " [" isearch-error "]") "") (or isearch-message-suffix-add "")) - 'face 'minibuffer-prompt)) + isearch-message-properties)) (defun isearch-lazy-count-format (&optional suffix-p) "Format the current match number and the total number of matches. |