Merge fix for Bug#8870 from trunk

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f6d665e0f0eafcc0be3e4600b38dae3bb89688a8..e91bb059d60ab12369169eb802fc3d75260910d8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-27  Jambunathan K  <kjambunathan@gmail.com>
+
+       * tar-mode.el (tar-untar-buffer): Set coding-system-for-write to
+       no-conversion (Bug#8870).
+
 2011-06-19  Chong Yidong  <cyd@stupidchicken.com>
 
        * frame.el (special-display-popup-frame): Doc fix (Bug#8853).

diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index ba9294a846a569e543f29c2da03466d0319b2536..7335a7ff527da726023253dc9365511cce8919e9 100644 (file)
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -477,7 +477,8 @@ MODE should be an integer which is a file mode value."
             (if (and dir (not (file-exists-p dir)))
                 (make-directory dir t))
             (unless (file-directory-p name)
-              (write-region start end name))
+             (let ((coding-system-for-write 'no-conversion))
+               (write-region start end name)))
             (set-file-modes name (tar-header-mode descriptor))))))))
 
 (defun tar-summarize-buffer ()