Add 2010 to copyright years.

[bpt/emacs.git] / lisp / tar-mode.el

diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index e0c78c8..be9af8e 100644 (file)
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -1,7 +1,8 @@
 ;;; tar-mode.el --- simple editing of tar files from GNU emacs
 
 ;; Copyright (C) 1990, 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;;   Free Software Foundation, Inc.
 
 ;; Author: Jamie Zawinski <jwz@lucid.com>
 ;; Maintainer: FSF
@@ -170,8 +171,9 @@ This information is useful, but it takes screen space away from file names."
        ;; state correctly: the raw data is expected to be always larger than
        ;; the summary.
        (progn
-        (assert (eq tar-data-swapped
-                    (> (buffer-size tar-data-buffer) (buffer-size))))
+        (assert (or (= (buffer-size tar-data-buffer) (buffer-size))
+                     (eq tar-data-swapped
+                         (> (buffer-size tar-data-buffer) (buffer-size)))))
         tar-data-swapped)))
 
 (defun tar-swap-data ()
@@ -267,7 +269,7 @@ write-date, checksum, link-type, and link-name."
           (setq name (concat (substring string tar-prefix-offset
                                         (1- (match-end 0)))
                              "/" name)))
-        (if default-enable-multibyte-characters
+        (if (default-value 'enable-multibyte-characters)
             (setq name
                   (decode-coding-string name coding)
                   linkname
@@ -311,8 +313,12 @@ write-date, checksum, link-type, and link-name."
            link-p
            linkname
            uname-valid-p
-           (and uname-valid-p (substring string tar-uname-offset uname-end))
-           (and uname-valid-p (substring string tar-gname-offset gname-end))
+           (when uname-valid-p
+             (decode-coding-string
+              (substring string tar-uname-offset uname-end) coding))
+           (when uname-valid-p
+             (decode-coding-string
+              (substring string tar-gname-offset gname-end) coding))
            (tar-parse-octal-integer string tar-dmaj-offset tar-dmin-offset)
            (tar-parse-octal-integer string tar-dmin-offset tar-prefix-offset)
            ))))))
@@ -819,7 +825,7 @@ appear on disk when you save the tar-file's buffer."
             (if (or (not coding)
                     (eq (coding-system-type coding) 'undecided))
                 (setq coding (detect-coding-region start end t)))
-            (if (and default-enable-multibyte-characters
+            (if (and (default-value 'enable-multibyte-characters)
                      (coding-system-get coding :for-unibyte))
                 (with-current-buffer buffer
                   (set-buffer-multibyte nil)))
@@ -903,12 +909,14 @@ the current tar-entry."
         (end (+ start size))
         (inhibit-file-name-handlers inhibit-file-name-handlers)
         (inhibit-file-name-operation inhibit-file-name-operation))
-    (save-restriction
-      (widen)
+    (with-current-buffer
+       (if (tar-data-swapped-p) tar-data-buffer (current-buffer))
       ;; Inhibit compressing a subfile again if *both* name and
       ;; to-file are handled by jka-compr
-      (if (and (eq (find-file-name-handler name 'write-region) 'jka-compr-handler)
-              (eq (find-file-name-handler to-file 'write-region) 'jka-compr-handler))
+      (if (and (eq (find-file-name-handler name 'write-region)
+                  'jka-compr-handler)
+              (eq (find-file-name-handler to-file 'write-region)
+                  'jka-compr-handler))
          (setq inhibit-file-name-handlers
                (cons 'jka-compr-handler
                      (and (eq inhibit-file-name-operation 'write-region)
@@ -1012,7 +1020,10 @@ for this to be permanent."
         (read-string "New UID string: " (tar-header-uname descriptor))))))
   (cond ((stringp new-uid)
         (setf (tar-header-uname (tar-current-descriptor)) new-uid)
-        (tar-alter-one-field tar-uname-offset (concat new-uid "\000")))
+        (tar-alter-one-field tar-uname-offset
+                              (concat (encode-coding-string
+                                       new-uid tar-file-name-coding-system)
+                                      "\000")))
        (t
         (setf (tar-header-uid (tar-current-descriptor)) new-uid)
         (tar-alter-one-field tar-uid-offset
@@ -1038,7 +1049,9 @@ for this to be permanent."
   (cond ((stringp new-gid)
         (setf (tar-header-gname (tar-current-descriptor)) new-gid)
         (tar-alter-one-field tar-gname-offset
-          (concat new-gid "\000")))
+                              (concat (encode-coding-string
+                                       new-gid tar-file-name-coding-system)
+                                      "\000")))
        (t
         (setf (tar-header-gid (tar-current-descriptor)) new-gid)
         (tar-alter-one-field tar-gid-offset