diff options
Diffstat (limited to 'lisp/ido.el')
| -rw-r--r-- | lisp/ido.el | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/lisp/ido.el b/lisp/ido.el index 6707d814077..7198649e5a5 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -4492,8 +4492,6 @@ For details of keybindings, see `ido-find-file'." (ido-tidy)) (throw 'ido contents)))) -(defvar ido--overlay nil) - (defun ido-exhibit () "Post command hook for Ido." ;; Find matching files and display a list in the minibuffer. @@ -4728,16 +4726,13 @@ For details of keybindings, see `ido-find-file'." (let ((inf (ido-completions contents))) (setq ido-show-confirm-message nil) (ido-trace "inf" inf) - (when ido--overlay - (delete-overlay ido--overlay)) - (let ((o (make-overlay (point-max) (point-max) nil t t))) - (when (> (length inf) 0) - ;; For hacks that redefine ido-completions function (bug#39379) - (when (eq (aref inf 0) ?\n) - (setq inf (concat " " inf))) - (put-text-property 0 1 'cursor t inf)) - (overlay-put o 'after-string inf) - (setq ido--overlay o))) + (let ((pos (point))) + (insert inf) + (if (< pos (point-max)) + ;; Tell set-minibuffer-message where to display the + ;; overlay with temporary messages. + (put-text-property pos (1+ pos) 'minibuffer-message t))) + ) )))) (defun ido-completions (name) |