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: Thu, 31 Mar 2016 17:30:48 -0400 Message-ID: References: <20160331200230.13543.3434@vcs.savannah.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1459459866 13831 80.91.229.3 (31 Mar 2016 21:31:06 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 31 Mar 2016 21:31:06 +0000 (UTC) Cc: Eli Zaretskii To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 31 23:30:57 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 1alkB7-0003wx-G4 for ged-emacs-devel@m.gmane.org; Thu, 31 Mar 2016 23:30:57 +0200 Original-Received: from localhost ([::1]:34545 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alkB7-0000Fs-1k for ged-emacs-devel@m.gmane.org; Thu, 31 Mar 2016 17:30:57 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44204) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alkB3-0000FM-Nw for emacs-devel@gnu.org; Thu, 31 Mar 2016 17:30:54 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1alkB2-0002Xv-S5 for emacs-devel@gnu.org; Thu, 31 Mar 2016 17:30:53 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:60422) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alkAz-0002Vy-3l; Thu, 31 Mar 2016 17:30:49 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0CcDQA731xV/0+KpUVcgxCEAshgBAICgTw9EAEBAQEBAQGBCkEFg10BAQRWIxALNBIUGA2IY88jAQEBAQYCAR+LOoE9AYNHBxaEFwWfF4ZpjT+BRSNhgTYkgVkigngBAQE X-IPAS-Result: A0CcDQA731xV/0+KpUVcgxCEAshgBAICgTw9EAEBAQEBAQGBCkEFg10BAQRWIxALNBIUGA2IY88jAQEBAQYCAR+LOoE9AYNHBxaEFwWfF4ZpjT+BRSNhgTYkgVkigngBAQE X-IronPort-AV: E=Sophos;i="5.13,465,1427774400"; d="scan'208";a="204318660" Original-Received: from 69-165-138-79.dsl.teksavvy.com (HELO pastel.home) ([69.165.138.79]) by ironport2-out.teksavvy.com with ESMTP; 31 Mar 2016 17:30:48 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 8871A63FC5; Thu, 31 Mar 2016 17:30:48 -0400 (EDT) In-Reply-To: (Eli Zaretskii's message of "Thu, 31 Mar 2016 20:02:30 +0000") 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:202536 Archived-At: > --- a/lisp/vc/vc-annotate.el > +++ b/lisp/vc/vc-annotate.el [...] > + ;; 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? Stefan