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: Mon, 28 Aug 2023 19:51:25 +0300 Message-ID: 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> <2f6986e7-f96b-98bd-4581-7503bb01b111@gutov.dev> <83ttsnoda5.fsf@gnu.org> <49d5e741-f97d-ae4d-f79c-ec418051d868@gutov.dev> <83v8d2kx1g.fsf@gnu.org> <8be534f8-9f03-5de6-53c8-76be0f9456fa@gutov.dev> <831qfpkpx7.fsf@gnu.org> <02a7f7fe-74c2-a59a-7d7d-1da9d3270c8a@gutov.dev> <83ledvicvz.fsf@gnu.org> <767fb864-0d81-ea89-e36e-f56f820d6bbf@gutov.dev> <83cyz7i1sx.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="13944"; 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 Mon Aug 28 18:52:07 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 1qafTC-0003KC-GU for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 28 Aug 2023 18:52:07 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qafT3-0005Th-Kv; Mon, 28 Aug 2023 12:51:57 -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 1qafT1-0005TN-SF for bug-gnu-emacs@gnu.org; Mon, 28 Aug 2023 12:51:55 -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 1qafT1-00013T-Jg for bug-gnu-emacs@gnu.org; Mon, 28 Aug 2023 12:51:55 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qafT8-0002yH-1E for bug-gnu-emacs@gnu.org; Mon, 28 Aug 2023 12:52: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: Mon, 28 Aug 2023 16:52:01 +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.169324150411391 (code B ref 65049); Mon, 28 Aug 2023 16:52:01 +0000 Original-Received: (at 65049) by debbugs.gnu.org; 28 Aug 2023 16:51:44 +0000 Original-Received: from localhost ([127.0.0.1]:48920 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qafSq-0002xf-Ei for submit@debbugs.gnu.org; Mon, 28 Aug 2023 12:51:44 -0400 Original-Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:60539) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qafSo-0002xQ-GU for 65049@debbugs.gnu.org; Mon, 28 Aug 2023 12:51:43 -0400 Original-Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id DB7A83200D49; Mon, 28 Aug 2023 12:51:29 -0400 (EDT) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Mon, 28 Aug 2023 12:51:30 -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= 1693241489; x=1693327889; bh=r0jmEIW71DtajF7uTUb5LueSrxe8GA1jyvY Xr3b8C20=; b=RiedjxyIyRdX3evhfol1KNZuhSGo9mttqn/0m+m+RCQ6BiqUS93 pfyGpHqExc1h+OgyAJYkcQ6Dqzmzb91eS1l0xy0h4s7i/coebP+Uw0v2sAZYQHDq RYUFnRM3djuZ8CWbiswDymT/IV+l0lb0okSUkBmOsSO3LRPdAaZAa4vyCFf6Tjoc 6VU9EQ66hVIatIDH58dlYxYjncTHSlFhI20TEjxBYa3twG1rVCYvAj5y/rPMxJey 8nIFZdnA3hCe0/+gu7WtSfqKagEvuHfgpv49qOFf5LwyqT6Ckwzi+96eG79X5GVy +bkRLQPWm0WGE8wrkvYPcOsIMbewOLSuMgQ== 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= 1693241489; x=1693327889; bh=r0jmEIW71DtajF7uTUb5LueSrxe8GA1jyvY Xr3b8C20=; b=R4hz3gHUQbxawJnu0gj/7Nz1UnFM7DxOOKuKJFWYjHS77HOCzb/ h++Krmh5akNL38Kuqq9hLRJ+xYEWWsYROVyWvoZx8M6gLq1x/Xu4kwtLSPBEy+j2 ZvLsyU7ArS6ekAHHGbzeNDfz+wHacvDsdfDLXia65poXALF8wC1cHNgTQV9r4B+3 sTsGpV07Z3WE1JcxiR7DRX8Eaadjz51MTGYlOZWHr7insuBH4GuG5abIdHZnykW5 WweDCMGRJK+Ej0ZPbGfTU4q4xVpQ1T4v8DpjON3Gl85NAcY6X5g9bm14zMOOKHlC WHlWIuKVd/MZc2eJ9KaiahKiyCOkt3W+ZyQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrudefgedguddtgecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefkffggfgfuvfevfhfhjggtgfesthejredttdefjeenucfhrhhomhepffhm ihhtrhihucfiuhhtohhvuceoughmihhtrhihsehguhhtohhvrdguvghvqeenucggtffrrg htthgvrhhnpeeigfetveehveevffehledtueekieeikeeufeegudfgfeeghfdulefgfeev ledvveenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe gumhhithhrhiesghhuthhovhdruggvvh X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 28 Aug 2023 12:51:28 -0400 (EDT) Content-Language: en-US In-Reply-To: <83cyz7i1sx.fsf@gnu.org> 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:268640 Archived-At: On 28/08/2023 19:12, Eli Zaretskii wrote: >> Date: Mon, 28 Aug 2023 16:45:23 +0300 >> Cc:juri@linkov.net,habamax@gmail.com,65049@debbugs.gnu.org >> From: Dmitry Gutov >> >> On 28/08/2023 15:12, Eli Zaretskii wrote: >>>> Try edebug-instrumenting vc-diff-internal and then calling vc-root-diff >>>> anywhere (C-x v D). When the execution reaches the line that we have >>>> been discussing, you'll see that (vc-coding-system-for-diff (car files)) >>>> evaluates to 'undecided because (car files) is a directory. >>>> >>>> So this mechanism is always unused in vc-root-diff. >>> OK, but in that case 'undecided' is the best guess we can come up >>> with. It basically lets Emacs guess when it actually sees the stuff >>> in the diffs, while reading it into a buffer. >> Yes, and if it's good enough for the (possibly?) most-frequently used >> out of the vc-*-diff commands, then perhaps we don't need the additional >> detection logic? >> >> Since its introduction 30 years ago indeed the situation has changed a >> lot, with UTF-8 and its ubiquity. Removing the extra complication would >> make code a little easier to read, and reduce variability when >> reproducing problems. But there's no hurry, of course. > I'm not sure I understand which part do you want to remove. The part that currently looks like this: (coding-system-for-read ;; Force the EOL conversion to be -unix, in case the files ;; to be compared have DOS EOLs. In that case, EOL ;; conversion will produce a patch file that will either ;; fail to apply, or will change the EOL format of some of ;; the lines in the patched file. (coding-system-change-eol-conversion (if files (vc-coding-system-for-diff (car files)) 'undecided) 'unix)) As we've established, the only part that's used in vc-root-diff (and only now) is binding coding-system-change-eol-conversion to 'undecided-unix'. We could leave it there, though it doesn't seem to change the behavior in my tests.