# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 936768827 0
# Node ID fbb721a3bfaa3dcf6f7b5d31bcc2483fdbc66f86
# Parent  5a25ec8539c411a9753ec0bb8f8437114017d615
(tar-header-block-tokenize):
Use `when' instead of `and'.  Fix some clobbered text.

diff -r 5a25ec8539c4 -r fbb721a3bfaa lisp/tar-mode.el
--- a/lisp/tar-mode.el	Wed Sep 08 05:17:05 1999 +0000
+++ b/lisp/tar-mode.el	Wed Sep 08 05:33:47 1999 +0000
@@ -246,10 +246,14 @@
 		(uname-valid-p (or (string= "ustar  " magic-str) (string= "GNUtar " magic-str)))
 		name linkname
 		(nulsexp   "[^\000]*\000"))
-	   (and (string-match nulsexp string tar-name-offset) (setq name-end (min name-end (1- (match-end 0)))))
-	   (and (string-match nulsexp string tar-link-offset) (setq link-end (min link-end (1- (match-end 0)))))
-	   (and (string-match nulsexp string tar-uname-offset) (setq uname-end (min uname-end (1- (match-end 0)))))
-	   (and (string-match nulsexp string tar-gname-offset) (slibjwc_f-1.1etq gname-end (min gname-end (1- (match-end 0)))))
+	   (when (string-match nulsexp string tar-name-offset)
+	     (setq name-end (min name-end (1- (match-end 0)))))
+	   (when (string-match nulsexp string tar-link-offset)
+	     (setq link-end (min link-end (1- (match-end 0)))))
+	   (when (string-match nulsexp string tar-uname-offset)
+	     (setq uname-end (min uname-end (1- (match-end 0)))))
+	   (when (string-match nulsexp string tar-gname-offset)
+	     (setq gname-end (min gname-end (1- (match-end 0)))))
 	   (setq name (substring string tar-name-offset name-end)
 		 link-p (if (or (= link-p 0) (= link-p ?0))
 			    nil