]> code.delx.au - gnu-emacs/commitdiff
(tar-extract): Be sure to call
authorKenichi Handa <handa@m17n.org>
Sat, 22 Oct 2005 01:24:38 +0000 (01:24 +0000)
committerKenichi Handa <handa@m17n.org>
Sat, 22 Oct 2005 01:24:38 +0000 (01:24 +0000)
find-operation-coding-system if set-auto-coding doesn't find a
coding system.

lisp/tar-mode.el

index 4362e97af0b1ab663372408c6947d95c8ddd7561..0e57d541dfe6ae259563837cac8b02c5708eb295 100644 (file)
@@ -735,7 +735,9 @@ appear on disk when you save the tar-file's buffer."
                             (and set-auto-coding-function
                                  (save-excursion
                                    (funcall set-auto-coding-function
-                                            name (- (point-max) (point)))))))
+                                            name (- (point-max) (point)))))
+                            (car (find-operation-coding-system
+                                  'insert-file-contents name t))))
                        (multibyte enable-multibyte-characters)
                        (detected (detect-coding-region
                                   (point-min)
@@ -747,13 +749,7 @@ appear on disk when you save the tar-file's buffer."
                                          coding
                                          (coding-system-eol-type detected))))
                      (setq coding
-                           (or (find-new-buffer-file-coding-system detected)
-                               (let ((file-coding
-                                      (find-operation-coding-system
-                                       'insert-file-contents buffer-file-name)))
-                                 (if (consp file-coding)
-                                     (setq file-coding (car file-coding))
-                                   file-coding)))))
+                           (find-new-buffer-file-coding-system detected)))
                    (if (or (eq coding 'no-conversion)
                            (eq (coding-system-type coding) 5))
                        (setq multibyte (set-buffer-multibyte nil)))