(tar-header-block-tokenize):

Use `when' instead of `and'.  Fix some clobbered text.

diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index d76950ba083672e22444196d134843761afcaa78..eb8a42584f1da9583e7ed7ab8b43f1147e4c9d09 100644 (file)
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -246,10 +246,14 @@ write-date, checksum, link-type, and link-name."
                (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