From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] emacs-25 e30c3e9: Fix EOL decoding in vc-annotate with SVN back-end on MS-Windows Date: Fri, 01 Apr 2016 09:21:25 -0400 Message-ID: References: <20160331200230.13543.3434@vcs.savannah.gnu.org> <83oa9tu7f3.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1459517055 19795 80.91.229.3 (1 Apr 2016 13:24:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 1 Apr 2016 13:24:15 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 01 15:24:10 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1alz3V-0000Fk-Ly for ged-emacs-devel@m.gmane.org; Fri, 01 Apr 2016 15:24:05 +0200 Original-Received: from localhost ([::1]:44357 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alz3U-0006Gv-NF for ged-emacs-devel@m.gmane.org; Fri, 01 Apr 2016 09:24:04 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57041) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alz12-0002L6-Cw for emacs-devel@gnu.org; Fri, 01 Apr 2016 09:21:36 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1alz11-0002Ft-IH for emacs-devel@gnu.org; Fri, 01 Apr 2016 09:21:32 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:54010) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alz0w-0002CX-D5; Fri, 01 Apr 2016 09:21:26 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0CdDQA731xV/0+KpUVcgxCEAshgBAICgTw9EAEBAQEBAQGBCkEFg10BAQRWIxALNBIUGA0QAROIP88jAQEBAQYCAR+LOoE9AYNHB4QtBZ8Xg2uCfo0/gUUjYYE2JIFZIoJ4AQEB X-IPAS-Result: A0CdDQA731xV/0+KpUVcgxCEAshgBAICgTw9EAEBAQEBAQGBCkEFg10BAQRWIxALNBIUGA0QAROIP88jAQEBAQYCAR+LOoE9AYNHB4QtBZ8Xg2uCfo0/gUUjYYE2JIFZIoJ4AQEB X-IronPort-AV: E=Sophos;i="5.13,465,1427774400"; d="scan'208";a="204418007" Original-Received: from 69-165-138-79.dsl.teksavvy.com (HELO pastel.home) ([69.165.138.79]) by ironport2-out.teksavvy.com with ESMTP; 01 Apr 2016 09:21:25 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 204E964043; Fri, 1 Apr 2016 09:21:25 -0400 (EDT) In-Reply-To: <83oa9tu7f3.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 01 Apr 2016 10:14:56 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:202564 Archived-At: >> > + ;; On DOS/Windows, "svn annotate" will produce CRLF EOLs even >> > + ;; if the original file has Unix EOLs, which will show ^M >> > + ;; characters in the Annotate buffer. Prevent that by forcing >> > + ;; DOS EOL decoding. >> > + (if (memq system-type '(windows-nt ms-dos)) >> > + (setq coding-system-for-read >> > + (coding-system-change-eol-conversion coding-system-for-read >> > + 'dos))) >> Why do we need to put this in vc-annotate rather than in vc-svn.el? > Any command running on MS-Windows should be expected to produce a CRLF > output, so inheriting EOL decoding from the buffer is not a good idea. So you're saying that it's not just "svn annotate" that does that but (e.g.) "git annotate" does it as well? If so, please clarify the comment to explain that "svn annotate" is just one example. Stefan