# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1209749571 0
# Node ID bbc1b1a5633e1d6981ca121e9a35760e53fc0af1
# Parent  9154a25c84c6bb521da9af42eb9e69504052d764
(completion--insert-strings): Use string-width rather than length.

diff -r 9154a25c84c6 -r bbc1b1a5633e lisp/ChangeLog
--- a/lisp/ChangeLog	Fri May 02 17:22:04 2008 +0000
+++ b/lisp/ChangeLog	Fri May 02 17:32:51 2008 +0000
@@ -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 -r 9154a25c84c6 -r bbc1b1a5633e lisp/minibuffer.el
--- a/lisp/minibuffer.el	Fri May 02 17:22:04 2008 +0000
+++ b/lisp/minibuffer.el	Fri May 02 17:32:51 2008 +0000
@@ -578,8 +578,9 @@
     (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 @@
                                  `(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))