From: Kenichi Handa <handa@m17n.org>
Date: Mon, 27 Jul 1998 00:37:00 +0000 (+0000)
Subject: (archive-set-buffer-as-visiting-file): Give FILENAME
X-Git-Tag: emacs-20.3~245
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7e5ad777442c0e70d15995fd1005602ab475e99d;p=emacs.git

(archive-set-buffer-as-visiting-file): Give FILENAME
arg to set-auto-coding-funciton.
(archive-extract): Pay attention to enable-multibyte-characters.
(archive-*-write-file-member): Likewise.
(archive-rename-entry): Likewise.
---

diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index ca5d6185337..bfdc6b5f94c 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -841,7 +841,7 @@ using `make-temp-name', and the generated name is returned."
 	   (or coding-system-for-read
 	       (and set-auto-coding-function
 		    (funcall set-auto-coding-function
-			     (- (point-max) (point-min))))
+			     filename (- (point-max) (point-min))))
 	       ;; dos-w32.el defines find-operation-coding-system for
 	       ;; DOS/Windows systems which preserves the coding-system
 	       ;; of existing files.  We want it to act here as if the
@@ -914,7 +914,9 @@ using `make-temp-name', and the generated name is returned."
 	       (null
 		(let (;; We may have to encode file name arguement for
 		      ;; external programs.
-		      (coding-system-for-write file-name-coding-system)
+		      (coding-system-for-write
+		       (and enable-multibyte-characters
+			    file-name-coding-system))
 		      ;; We read an archive member by no-conversion at
 		      ;; first, then decode appropriately by calling
 		      ;; archive-set-buffer-as-visiting-file later.
@@ -1098,7 +1100,9 @@ using `make-temp-name', and the generated name is returned."
 	  (if (aref descr 3)
 	      ;; Set the file modes, but make sure we can read it.
 	      (set-file-modes tmpfile (logior ?\400 (aref descr 3))))
-	  (setq ename (encode-coding-string ename file-name-coding-system))
+	  (if enable-multibyte-characters
+	      (setq ename
+		    (encode-coding-string ename file-name-coding-system)))
           (let ((exitcode (apply 'call-process
                                  (car command)
                                  nil
@@ -1277,7 +1281,9 @@ as a relative change like \"g+rw\" as for chmod(2)"
     (if (fboundp func)
         (progn
 	  (funcall func (buffer-file-name)
-		   (encode-coding-string newname file-name-coding-system)
+		   (if enable-multibyte-characters
+		       (encode-coding-string newname file-name-coding-system)
+		     newname)
 		   descr)
 	  (archive-resummarize))
       (error "Renaming is not supported for this archive type"))))