diff options
| -rw-r--r-- | lisp/ChangeLog | 1 | ||||
| -rw-r--r-- | lisp/minibuffer.el | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bf1265a835d..6405f47dece 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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> diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 2890978908a..02f695e41d3 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -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)) |