summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2009-01-16 02:38:58 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2009-01-16 02:38:58 +0000
commitb6388cc99cf72e1cce76113d47f9c61539ce4503 (patch)
tree8916014d5c95c84cb722c52b3a83e5f3ec7d3a06
parent38cb7a93b178968c71ac4ff0c138e04a31f0aced (diff)
downloademacs-b6388cc99cf72e1cce76113d47f9c61539ce4503.tar.gz
(tar-rename-entry): Only test the magic string, without
its version number, and then set both.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/tar-mode.el4
2 files changed, 7 insertions, 2 deletions
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 <user42@zip.com.au>
+
+ * 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 <rms@gnu.org>
* 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))))