diff options
| author | João Távora <joaotavora@gmail.com> | 2019-11-09 14:54:09 +0000 |
|---|---|---|
| committer | João Távora <joaotavora@gmail.com> | 2019-11-09 14:55:42 +0000 |
| commit | afe4969a3b3b38014387a828b66f5dbc3a462a57 (patch) | |
| tree | ca8a2072392d6dbb846393bf781d119de0219424 /lisp/icomplete.el | |
| parent | 5c74b806a6fb0a4cb237300ab0a5418a109ced5e (diff) | |
| download | emacs-afe4969a3b3b38014387a828b66f5dbc3a462a57.tar.gz | |
Revert "Nudge icomplete-mode a little closer to fido-mode"
Fixes bug#38131.
This is not the best way to have fido-mdoe emulate that particular bit
of ido-mode.
This reverts commit 5761a1a3939e23d8e8c725241dd9398a12f191b0.
Diffstat (limited to 'lisp/icomplete.el')
| -rw-r--r-- | lisp/icomplete.el | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/lisp/icomplete.el b/lisp/icomplete.el index 879068e4e95..f7e08fe1358 100644 --- a/lisp/icomplete.el +++ b/lisp/icomplete.el @@ -572,13 +572,6 @@ matches exist." (compare (compare-strings name nil nil most nil nil completion-ignore-case)) (ellipsis (if (char-displayable-p ?…) "…" "...")) - ;; `determ' is what we "determined" to be the thing that - ;; TAB will complete to. Also, if we're working with a - ;; large prefix (like when finding files), we want to - ;; truncate the common prefix away. `determ-ellipsis' - ;; says if we should do it with an `ellipsis'. Icomplete - ;; uses one, Ido doesn't. - (determ-ellipsis (if fido-mode "" ellipsis)) (determ (unless (or (eq t compare) (eq t most-try) (= (setq compare (1- (abs compare))) (length most))) @@ -589,10 +582,8 @@ matches exist." (substring most compare)) ;; Don't bother truncating if it doesn't gain ;; us at least 2 columns. - ((< compare (+ 2 (string-width determ-ellipsis))) - most) - (t (concat determ-ellipsis - (substring most compare)))) + ((< compare (+ 2 (string-width ellipsis))) most) + (t (concat ellipsis (substring most compare)))) close-bracket))) ;;"-prospects" - more than one candidate (prospects-len (+ (string-width @@ -673,8 +664,6 @@ matches exist." (mapconcat 'identity prospects icomplete-separator) (and limit (concat icomplete-separator ellipsis)) "}") - (put-text-property 1 (1- (length determ)) - 'face 'icomplete-first-match determ) (concat determ " [Matched]")))))) ;;; Iswitchb compatibility |