From: Eli Zaretskii Date: Wed, 9 May 2001 15:37:30 +0000 (+0000) Subject: (tar-extract): Pay attention to the value of X-Git-Tag: emacs-pretest-21.0.104~578 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c533a7e29a5760a65f1f51069db3981c9014fe52;p=emacs.git (tar-extract): Pay attention to the value of coding-system-for-read, if it is non-nil. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6d55e8c7730..21dd7b58abc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2001-05-09 Eli Zaretskii + * tar-mode.el (tar-extract): Pay attention to the value of + coding-system-for-read, if it is non-nil. + * calendar/holidays.el (holidays): Add an autoload cookie. From Pavel Jan,Bm(Bk . diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el index 264bc37f2e6..fac148b2b63 100644 --- a/lisp/tar-mode.el +++ b/lisp/tar-mode.el @@ -716,10 +716,11 @@ appear on disk when you save the tar-file's buffer." ;; We need to mimic the parts of insert-file-contents ;; which determine the coding-system and decode the text. (let ((coding - (and set-auto-coding-function - (save-excursion - (funcall set-auto-coding-function - name (- (point-max) (point)))))) + (or coding-system-for-read + (and set-auto-coding-function + (save-excursion + (funcall set-auto-coding-function + name (- (point-max) (point))))))) (multibyte enable-multibyte-characters) (detected (detect-coding-region 1 (min 16384 (point-max)) t)))