# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1212287704 0
# Node ID a4904e4111c54f17ac676e562d5d4cefec85bd89
# Parent  15ffd5c2dc179a2eed7d9e81075719351b44172c# Parent  8436412d2e08d4b2ae6c4e74452929b166593005
Merge from emacs--rel--22

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

diff -r 15ffd5c2dc17 -r a4904e4111c5 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jun 01 02:34:55 2008 +0000
+++ b/lisp/ChangeLog	Sun Jun 01 02:35:04 2008 +0000
@@ -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 -r 15ffd5c2dc17 -r a4904e4111c5 lisp/tar-mode.el
--- a/lisp/tar-mode.el	Sun Jun 01 02:34:55 2008 +0000
+++ b/lisp/tar-mode.el	Sun Jun 01 02:35:04 2008 +0000
@@ -398,7 +398,7 @@
 	;; (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