procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

icomplete-prospects-height fix (tiny change)

Browse source 
* icomplete.el (icomplete-completions):
Honor icomplete-prospects-height once more following 2012-11-29 changes.

Fixes: debbugs:13224
This commit is contained in:
Wesley Dawson 2013-01-04 00:20:49 -08:00 • committed by Glenn Morris
parent c0bd248ccb
commit bdd9367d4e
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2013-01-04 Wesley Dawson <whd@lavabit.com> (tiny change)
* icomplete.el (icomplete-completions):
Honor icomplete-prospects-height once more following
2012-11-29 changes. (Bug#13224)
2013-01-04 Stefan Monnier <monnier@iro.umontreal.ca>
* subr.el (internal--called-interactively-p--get-frame): Find aliases

10
lisp/icomplete.el
View file

@ -343,8 +343,10 @@ are exhibited within the square braces.)"
(t (concat "…" (substring most compare))))
close-bracket)))
;;"-prospects" - more than one candidate
(prospects-len (+ (length determ) 6 ;; take {,...} into account
(string-width (buffer-string))))
(prospects-len (+ (length determ)
(string-width icomplete-separator)
3 ;; take {…} into account
(string-width (buffer-string))))
(prospects-max
;; Max total length to use, including the minibuffer content.
(* (+ icomplete-prospects-height
@ -375,7 +377,9 @@ are exhibited within the square braces.)"
(cond ((string-equal comp "") (setq most-is-exact t))
((member comp prospects))
(t (setq prospects-len
(+ (string-width comp) 1 prospects-len))
(+ (string-width comp)
(string-width icomplete-separator)
prospects-len))
(if (< prospects-len prospects-max)
(push comp prospects)
(setq limit t))))))