From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: EOL conversion of files in .tar archives Date: Wed, 23 May 2007 15:34:21 +0300 Message-ID: References: <87abvwrzwz.fsf@stupidchicken.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: sea.gmane.org 1179923746 10852 80.91.229.12 (23 May 2007 12:35:46 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 23 May 2007 12:35:46 +0000 (UTC) To: cyd@stupidchicken.com, emacs-devel@gnu.org, handa@m17n.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 23 14:35:38 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1Hqq3z-0001QV-5j for ged-emacs-devel@m.gmane.org; Wed, 23 May 2007 14:35:35 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Hqq40-0004vY-PD for ged-emacs-devel@m.gmane.org; Wed, 23 May 2007 08:35:36 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Hqq2s-0004HO-CS for emacs-devel@gnu.org; Wed, 23 May 2007 08:34:26 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Hqq2r-0004Gx-ER for emacs-devel@gnu.org; Wed, 23 May 2007 08:34:25 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Hqq2r-0004Go-60 for emacs-devel@gnu.org; Wed, 23 May 2007 08:34:25 -0400 Original-Received: from romy.inter.net.il ([213.8.233.24]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Hqq2q-0002Wy-Lu for emacs-devel@gnu.org; Wed, 23 May 2007 08:34:25 -0400 Original-Received: from HOME-C4E4A596F7 (IGLD-80-230-39-23.inter.net.il [80.230.39.23]) by romy.inter.net.il (MOS 3.7.3-GA) with ESMTP id HXB59177 (AUTH halo1); Wed, 23 May 2007 15:34:16 +0300 (IDT) In-reply-to: (message from Eli Zaretskii on Wed, 23 May 2007 10:15:55 +0300) X-detected-kernel: FreeBSD 4.7-5.2 (or MacOS X 10.2-10.4) (2) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:71650 Archived-At: > Date: Wed, 23 May 2007 10:15:55 +0300 > From: Eli Zaretskii > Cc: emacs-devel@gnu.org, handa@m17n.org > > I'm okay with conditioning on w32 on the release branch. How's the following for the branch? Index: lisp/tar-mode.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/tar-mode.el,v retrieving revision 1.108 diff -u -r1.108 tar-mode.el --- lisp/tar-mode.el 21 Jan 2007 03:53:10 -0000 1.108 +++ lisp/tar-mode.el 23 May 2007 12:32:19 -0000 @@ -681,6 +681,12 @@ (goto-char (posn-point (event-end event))) (tar-extract)) +(defun tar-file-name-handler (op &rest args) + "Helper function for `tar-extract'." + (or (eq op 'file-exists-p) + (let ((file-name-handler-alist nil)) + (apply op args)))) + (defun tar-extract (&optional other-window-p) "In Tar mode, extract this entry of the tar file into its own buffer." (interactive) @@ -735,9 +741,19 @@ (save-excursion (funcall set-auto-coding-function name (- (point-max) (point))))) - (car (find-operation-coding-system - 'insert-file-contents - (cons name (current-buffer)) t)))) + ;; The following binding causes + ;; find-buffer-file-type-coding-system + ;; (defined on dos-w32.el) to act as if + ;; the file being extracted existed, so + ;; that the file's contents' encoding and + ;; EOL format are auto-detected. + (let ((file-name-handler-alist + (if (featurep 'dos-w32) + '(("" . tar-file-name-handler)) + file-name-handler-alist))) + (car (find-operation-coding-system + 'insert-file-contents + (cons name (current-buffer)) t))))) (multibyte enable-multibyte-characters) (detected (detect-coding-region (point-min) @@ -758,7 +774,9 @@ (coding-system-change-text-conversion coding 'raw-text))) (decode-coding-region (point-min) (point-max) coding) - (set-buffer-file-coding-system coding)) + ;; Force buffer-file-coding-system to what + ;; decode-coding-region actually used. + (set-buffer-file-coding-system last-coding-system-used t)) ;; Set the default-directory to the dir of the ;; superior buffer. (setq default-directory