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

(completion--insert-strings): Use string-width rather than length.

Browse source
This commit is contained in:
Stefan Monnier 2008-05-02 17:32:51 +00:00
parent 2bd49e46f4
commit e5b5b82d4e
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lisp/ChangeLog
View file

@ -8,6 +8,7 @@
* minibuffer.el (completion-hilit-commonality): Revert last change:
the leftover code was actually useful.
(completion--insert-strings): Use string-width rather than length.
2008-05-02 Sam Steingold <sds@gnu.org>

10
lisp/minibuffer.el
View file

@ -578,8 +578,9 @@ It also eliminates runs of equal strings."
(let* ((length (apply 'max
(mapcar (lambda (s)
(if (consp s)
(+ (length (car s)) (length (cadr s)))
(length s)))
(+ (string-width (car s))
(string-width (cadr s)))
(string-width s)))
strings)))
(window (get-buffer-window (current-buffer) 0))
(wwidth (if window (1- (window-width window)) 79))
@ -610,8 +611,9 @@ It also eliminates runs of equal strings."
`(display (space :align-to ,column))))
(when (< wwidth (+ (max colwidth
(if (consp str)
(+ (length (car str)) (length (cadr str)))
(length str)))
(+ (string-width (car str))
(string-width (cadr str)))
(string-width str)))
column))
(delete-char -2) (insert "\n") (setq column 0))
(if (not (consp str))