X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/e983096bb6a50fdae6625cb363642bcd74ec39c5..2b96868715a33d5c1bfbd03e961a222076398722:/lisp/ls-lisp.el

diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index f1a05a6f8c..08d07eb03a 100644
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -10,10 +10,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,9 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -329,9 +327,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))