Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1193

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5708f3b1952..2eadd9aa6e3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * tar-mode.el (tar-header-block-summarize): Ensure one space around
+        user&group.
+
 2008-05-31  John Paul Wallington  <jpw@pobox.com>
 
         * help-fns.el (describe-variable-custom-version-info): Handle
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index 931ef8907fa..4d05746a347 100644
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -398,7 +398,7 @@ MODE should be an integer which is a file mode value."
         ;; (ck (tar-header-checksum tar-hblock))
         (type (tar-header-link-type tar-hblock))
         (link-name (tar-header-link-name tar-hblock)))
-    (format "%c%c%s%8s/%-8s%7s%s %s%s"
+    (format "%c%c%s %7s/%-7s %7s%s %s%s"
             (if mod-p ?* ? )
             (cond ((or (eq type nil) (eq type 0)) ?-)
                   ((eq type 1) ?h)      ; link