diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-01-22 07:55:18 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-01-22 07:55:18 -0800 |
| commit | 5715eb94e90b33ace59dd4c4ccb6e2122bc6db72 (patch) | |
| tree | 1c3aef6f5135b25738cd0d3a98ad807ec698ac1e /lisp/minibuffer.el | |
| parent | a1bfb926ca484190298045fc9e775002fe872bb5 (diff) | |
| parent | 3b0938c0420de2b845e7e8f8fbbb57ddc61718f2 (diff) | |
| download | emacs-5715eb94e90b33ace59dd4c4ccb6e2122bc6db72.tar.gz emacs-5715eb94e90b33ace59dd4c4ccb6e2122bc6db72.tar.bz2 emacs-5715eb94e90b33ace59dd4c4ccb6e2122bc6db72.zip | |
Merge from origin/emacs-27
3b0938c042 (origin/emacs-27) Render Ido suggestions using an overlay
d5d90dc412 * doc/misc/tramp.texi (Bug Reports): Encourage use of "ema...
ac09e8e121 * lisp/vc/smerge-mode.el (smerge-match-conflict): Fix bug#...
7e37e61f4b Correct statement about ftcr and recommend HarfBuzz
4aec94da37 Avoid leaving artifacts when the system caret is used on w32
5abd8d73b0 Improve display of temporary echo messages
Diffstat (limited to 'lisp/minibuffer.el')
| -rw-r--r-- | lisp/minibuffer.el | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 4831bf72e9d..0589211877a 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -766,7 +766,7 @@ and `clear-minibuffer-message' called automatically via (defun set-minibuffer-message (message) "Temporarily display MESSAGE at the end of the minibuffer. The text is displayed for `minibuffer-message-clear-timeout' seconds -(if the value is a number), or until the next input event arrives, +\(if the value is a number), or until the next input event arrives, whichever comes first. Unlike `minibuffer-message', this function is called automatically via `set-message-function'." @@ -790,8 +790,14 @@ via `set-message-function'." ;; The current C cursor code doesn't know to use the overlay's ;; marker's stickiness to figure out whether to place the cursor ;; before or after the string, so let's spoon-feed it the pos. - (put-text-property 0 1 'cursor t message)) + (put-text-property 0 1 'cursor 1 message)) (overlay-put minibuffer-message-overlay 'after-string message) + ;; Make sure the overlay with the message is displayed before + ;; any other overlays in that position, in case they have + ;; resize-mini-windows set to nil and the other overlay strings + ;; are too long for the mini-window width. This makes sure the + ;; temporary message will always be visible. + (overlay-put minibuffer-message-overlay 'priority 1100) (when (numberp minibuffer-message-clear-timeout) (setq minibuffer-message-timer |