(ls-lisp-insert-directory): Use `string-width' instead of `length'

for comparing length of user and group names.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 84d1f3e5833ca91b99c3f83af1ad8f5f7ddb9878..8e0828a09cbfcc3deebc6483a76b6caaf22d59e3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-03  Eli Zaretskii  <eliz@gnu.org>
+
+       * ls-lisp.el (ls-lisp-insert-directory): Use `string-width'
+       instead of `length' for comparing length of user and group names.
+
 2008-05-03  Eric S. Raymond  <esr@snark.thyrsus.com>
 
        * vc-dispatcher.el: New file, separates out the UI and command 

diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index f1a05a6f8c85c0a526fc31e6e31c8cfa599734ac..4f13a023ab814e42d25449e065a507abc513ece3 100644 (file)
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -329,9 +329,11 @@ not contain `d', so that a full listing is expected."
          (dolist (elt file-alist)
            (setq attr (cdr elt)
                  fuid (nth 2 attr)
-                 uid-len (length (if (stringp fuid) fuid (format "%d" fuid)))
+                 uid-len (if (stringp fuid) (string-width fuid)
+                           (length (format "%d" fuid)))
                  fgid (nth 3 attr)
-                 gid-len (length (if (stringp fgid) fgid (format "%d" fgid)))
+                 gid-len (if (stringp fgid) (string-width fgid)
+                           (length (format "%d" fgid)))
                  file-size (nth 7 attr))
            (if (> uid-len max-uid-len)
                (setq max-uid-len uid-len))