Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-23 13:27:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

lisp/icomplete.el: Use "..." when U+2026 cannot be displayed.

Browse source
This commit is contained in:
Juanma Barranquero 2014-03-01 02:25:29 +01:00
parent 8268febfe0
commit 9a15505898
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2014-03-01 Juanma Barranquero <lekktu@gmail.com>
* icomplete.el (icomplete-completions):
Revert back to using "..." when ?… cannot be displayed.
2014-02-28 Juanma Barranquero <lekktu@gmail.com>
* finder.el (finder-unload-function): New function.

7
lisp/icomplete.el
View file

@ -392,6 +392,7 @@ matches exist."
;; a prefix of most, or something else.
(compare (compare-strings name nil nil
most nil nil completion-ignore-case))
(ellipsis (if (char-displayable-p ?…) "…" "..."))
(determ (unless (or (eq t compare) (eq t most-try)
(= (setq compare (1- (abs compare)))
(length most)))
@ -402,14 +403,14 @@ matches exist."
(substring most compare))
;; Don't bother truncating if it doesn't gain
;; us at least 2 columns.
((< compare 3) most)
(t (concat "…" (substring most compare))))
((< compare (+ 2 (length ellipsis))) most)
(t (concat ellipsis (substring most compare))))
close-bracket)))
;;"-prospects" - more than one candidate
(prospects-len (+ (string-width
(or determ (concat open-bracket close-bracket)))
(string-width icomplete-separator)
3 ;; take {…} into account
(+ 2 (length ellipsis)) ;; take {…} into account
(string-width (buffer-string))))
(prospects-max
;; Max total length to use, including the minibuffer content.