From: Stefan Monnier Date: Fri, 16 Jan 2009 02:38:58 +0000 (+0000) Subject: (tar-rename-entry): Only test the magic string, without X-Git-Tag: emacs-pretest-23.0.90~427 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b6388cc99cf72e1cce76113d47f9c61539ce4503;p=emacs.git (tar-rename-entry): Only test the magic string, without its version number, and then set both. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 86caa554a13..da963a00bae 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-01-16 Kevin Ryde + + * tar-mode.el (tar-rename-entry): Only test the magic string, without + its version number, and then set both. + 2009-01-16 Richard M Stallman * textmodes/paragraphs.el (sentence-end): Accept non-break space. diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el index 99a7303944a..12c39117ddd 100644 --- a/lisp/tar-mode.el +++ b/lisp/tar-mode.el @@ -1053,8 +1053,8 @@ for this to be permanent." (string-match "/" encoded-new-name (- (length encoded-new-name) 99)) (< (match-beginning 0) 155)) - (unless (equal (tar-header-magic descriptor) "ustar\0\0") - (tar-alter-one-field tar-magic-offset "ustar\0\0")) + (unless (equal (tar-header-magic descriptor) "ustar\0") + (tar-alter-one-field tar-magic-offset (concat "ustar\0" "00"))) (setq prefix (substring encoded-new-name 0 (match-beginning 0))) (setq encoded-new-name (substring encoded-new-name (match-end 0))))