[Emacs-diffs] Changes to emacs/lisp/minibuffer.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/05/02 17:32:51

Index: minibuffer.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/minibuffer.el,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- minibuffer.el       2 May 2008 17:02:52 -0000       1.35
+++ minibuffer.el       2 May 2008 17:32:51 -0000       1.36
@@ -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))