From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#65049: Minor update to the repro steps Date: Fri, 25 Aug 2023 00:44:58 +0300 Message-ID: <2f6986e7-f96b-98bd-4581-7503bb01b111@gutov.dev> References: <83y1iruky1.fsf@gnu.org> <83il9qom6k.fsf@gnu.org> <86v8dandhq.fsf@mail.linkov.net> <83bkf1woy3.fsf@gnu.org> <835y57tf23.fsf@gnu.org> <87edjvp6ev.fsf@gmail.com> <83350btdw8.fsf@gnu.org> <831qftspal.fsf@gnu.org> <35b50832-e9ca-9f57-fad6-68621d9b42e7@gutov.dev> <83pm3dqbtp.fsf@gnu.org> <789dacd3-8e62-74ad-f691-5b48cb1d678b@gutov.dev> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="24507"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Cc: 65049@debbugs.gnu.org, habamax@gmail.com, juri@linkov.net To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Aug 24 23:46:27 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qZI9q-00064y-Bi for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 24 Aug 2023 23:46:26 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZI9P-0004GG-9B; Thu, 24 Aug 2023 17:45:59 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qZI9O-0004Ep-Co for bug-gnu-emacs@gnu.org; Thu, 24 Aug 2023 17:45:58 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qZI9O-0000l6-4r for bug-gnu-emacs@gnu.org; Thu, 24 Aug 2023 17:45:58 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qZI9S-0005ga-AG for bug-gnu-emacs@gnu.org; Thu, 24 Aug 2023 17:46:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 24 Aug 2023 21:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65049 X-GNU-PR-Package: emacs Original-Received: via spool by 65049-submit@debbugs.gnu.org id=B65049.169291351421777 (code B ref 65049); Thu, 24 Aug 2023 21:46:02 +0000 Original-Received: (at 65049) by debbugs.gnu.org; 24 Aug 2023 21:45:14 +0000 Original-Received: from localhost ([127.0.0.1]:38776 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZI8g-0005fA-Du for submit@debbugs.gnu.org; Thu, 24 Aug 2023 17:45:14 -0400 Original-Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:42339) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZI8d-0005et-Jt for 65049@debbugs.gnu.org; Thu, 24 Aug 2023 17:45:12 -0400 Original-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 448623200937; Thu, 24 Aug 2023 17:45:01 -0400 (EDT) Original-Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Thu, 24 Aug 2023 17:45:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm3; t= 1692913500; x=1692999900; bh=Dcvn8/Fj5WMdaKHX2UbosRtq2tNJvHHO1AD 8V9U4Tik=; b=cd/F4UHIw0TxGnJ+trP+MJDSkz/SdYlptsVvtM9GzhLbl0LipyD q8dET2WaKlq3Po2Fxo9UNXyGdMqhwCjW76+ITfrV9Hd9r+SnWtWeHPI7C6LJMMxb Vyefwgo16YCS0GvjJlC4HzN5bSjX/T6sEzZl03jWxFRkB533bpWYkHVPqulbbiVc Jdymo3X2UWFqhyGrxhTwM/aa5Ul8hCKjHidTZ3qwtIPWwJ3nihwIovtdzH+ZZmCf tW+ellFTuXzE0JjdH0XLJLXtz85h2bld4uYSvt8CHYUYnfX+m0BJK5cV59ZJC8AM qsSLNKPFg2C3eYpejP0wwrqnesbhheiCAwg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1692913500; x=1692999900; bh=Dcvn8/Fj5WMdaKHX2UbosRtq2tNJvHHO1AD 8V9U4Tik=; b=qj38aqX4UBH6BqZO28TaaRg8g8Q3nMDhLoNdqgAlaHlQfgxKxSP Zs7ejPXteKIDMOUuKlIQg9MKbK6LQSjuv8SbXNUzuW2nAeXzRirkR3Dtirhu0aZ8 FjY2Q6sTHkHAEkToyt590H2DcuOzt5kF0a5aXkXvLww1jfePe0f5lvAaBFNvzIwc CMqIJKVd0SQvDiLqqa41ejfVjcCDT92o17hMv2dkPy52urmxjPGFeJrR9unnoZWA RIbd0XLPrleTn31kVSUDaC0HfixyM84CHyC+Ocrh9MSrf3jvFz5adqm4TRu239jV tkNREoj+3L6PxaV2sM6GqQOcrYDsYsSYCkQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedruddvjedgtddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffhvfevfhgjtgfgsehtkeertddtfeejnecuhfhrohhmpeffmhhi thhrhicuifhuthhovhcuoegumhhithhrhiesghhuthhovhdruggvvheqnecuggftrfgrth htvghrnhepgfdvleeitdehueeuuddtkeelffffudeiueeikefgleevudfhvdeuledtuefh keejnecuffhomhgrihhnpehgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepughmihhtrhihsehguhhtohhvrdguvghv X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 24 Aug 2023 17:44:59 -0400 (EDT) Content-Language: en-US In-Reply-To: <789dacd3-8e62-74ad-f691-5b48cb1d678b@gutov.dev> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:268369 Archived-At: On 25/08/2023 00:35, Dmitry Gutov wrote: > On 25/08/2023 00:06, Dmitry Gutov wrote: >> >>> But before I do, could you >>> please try the recipe here: >>> >>> https://debbugs.gnu.org/cgi/bugreport.cgi?bug=65049#68 >>> >>> but with the following change in step 4: >>> >>>    4. C-x RET f utf-8-dos RET >>> >>> That is, try the recipe on a Posix host with a file whose EOL format >>> is CRLF.  If that works without any changes in the current VC code, I >>> will be happy to make the first hunk Windows-specific. >> >> That works with the current emacs-29. Also tried with the patch >> applied -- still works. > > But here's a modification of the scenario that fails (again: both with > and without the patch): replace step 9 with > >   9. C-x v = > > The non-root diff looks a little different to begin with: it doesn't > show those ^M chars at the end of lines (whereas the result of > vc-root-diff shows them). That is likely the reason: buffer set up in a > different way. Looks like it's this line: (coding-system-for-read (if files (vc-coding-system-for-diff (car files)) 'undecided)) near the beginning of vc-diff-internal that creates the difference. Commenting it out makes the scenario work with both 'C-x v =' and 'C-x v D'.