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#71604: diff--get-revision-properties calls set-auto-mode twice Date: Mon, 17 Jun 2024 23:01:34 +0300 Message-ID: References: <865xu7zg6o.fsf@mail.linkov.net> 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="16282"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla Thunderbird Cc: 71604-done@debbugs.gnu.org To: Juri Linkov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Jun 17 22:02:45 2024 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 1sJIYt-00042v-N2 for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 17 Jun 2024 22:02:44 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJIYe-0005N6-FN; Mon, 17 Jun 2024 16:02:28 -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 1sJIYC-0005Jb-Sb for bug-gnu-emacs@gnu.org; Mon, 17 Jun 2024 16:02:02 -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 1sJIYC-00084a-Id for bug-gnu-emacs@gnu.org; Mon, 17 Jun 2024 16:02:00 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sJIYE-0002Zc-Mv for bug-gnu-emacs@gnu.org; Mon, 17 Jun 2024 16:02:02 -0400 Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Mon, 17 Jun 2024 20:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 71604 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Mail-Followup-To: 71604@debbugs.gnu.org, dmitry@gutov.dev, dmitry@gutov.dev Original-Received: via spool by 71604-done@debbugs.gnu.org id=D71604.17186545109853 (code D ref 71604); Mon, 17 Jun 2024 20:02:02 +0000 Original-Received: (at 71604-done) by debbugs.gnu.org; 17 Jun 2024 20:01:50 +0000 Original-Received: from localhost ([127.0.0.1]:36556 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJIY1-0002Yr-JB for submit@debbugs.gnu.org; Mon, 17 Jun 2024 16:01:49 -0400 Original-Received: from wfout4-smtp.messagingengine.com ([64.147.123.147]:57975) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJIXy-0002Ya-QN for 71604-done@debbugs.gnu.org; Mon, 17 Jun 2024 16:01:47 -0400 Original-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfout.west.internal (Postfix) with ESMTP id 72E621C00101; Mon, 17 Jun 2024 16:01:38 -0400 (EDT) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 17 Jun 2024 16:01:38 -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:subject:subject:to:to; s=fm3; t=1718654498; x=1718740898; bh=MYY8atP1AV1Q0OD20MKcdZEgBKK7egZEepV48qnUmTI=; b= WaGXk0gQSDZQGprXaO9Sp7Jggf0jLmfnjIsiKRieKnyVQ9z/Wq3OoYCT3Cq61AGq 0NKACVOcJgrMLNtkV7NkYc2kIEbYYzBeRVmmDWrWqeDGEATVVphNTt56439o1+N0 FFMOWgJTXzpQl5W/0apd33CX4x1Oj9oCPvyggk9YfnyQ4MQaosBv6Gyx8WCsxcNQ qvY7rvP9WTeh4k7vV5NA4oDGkKr9aTfmTe26VAswaKmBmHOBvmNED9LJOuX8kegV ZXrmo35/u8JmTgr/Fq9ZsQu/Ild//mX4bSSjsfU/W38q9/MIQqLibbofDb6Ll+Ma fWlgkOuPYVa1rPdG1wtr4g== 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:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1718654498; x= 1718740898; bh=MYY8atP1AV1Q0OD20MKcdZEgBKK7egZEepV48qnUmTI=; b=p vZyLGunLa/X74ouJnRfve4y7LcXw+ARgDRxPMUcI9TiD+U9/qeKL7LPWJ4nLIdYA 1RSObagQtF8KL4dtlDhmejGHD3J7P5z/Shk12mhG7n2MlBtvuJ/5A+lHUMl7IQut RbHGGz/88jzi2ovxber60sCmGr0LDpyq879SMavPqPDEdBYEESfLdclcG3VpQ1qY vuhyUrtV+ld8kbac3mQA8iyPXc6J+meVX3MRJyuL4tiidgNReRU8Pl0MPEs4+qnJ 0R9JP6D+D4syMQ7rLgcqB5diAYjQsuDGTEFqSIvKQrWrFSHlNU+4X7DWKsOgnIhQ DA0PbC3hC1qkyRb+FZV3w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrfedvhedgudeggecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefkffggfgfuvfevfhfhjggtgfesthejredttddvjeenucfhrhhomhepffhm ihhtrhihucfiuhhtohhvuceoughmihhtrhihsehguhhtohhvrdguvghvqeenucggtffrrg htthgvrhhnpeffieefvdelueektdfgleeigedugfevkeefjeevjeffteffueeuueeghfev ieduvdenucffohhmrghinhepghhnuhdrohhrghenucevlhhushhtvghrufhiiigvpedtne curfgrrhgrmhepmhgrihhlfhhrohhmpegumhhithhrhiesghhuthhovhdruggvvh X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 17 Jun 2024 16:01:36 -0400 (EDT) Content-Language: en-US In-Reply-To: <865xu7zg6o.fsf@mail.linkov.net> 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:287419 Archived-At: On 17/06/2024 19:33, Juri Linkov wrote: >> vc-find-revision-no-save calls set-auto-mode, and then we repeat that call >> in diff-syntax-fontify-props. >> >> Which is a problem with CC Mode because it parses the buffer inside the >> major mode function, and ends up doing that twice, at least the first time >> the buffer is initialized before being saved to revision cache. Not exactly >> double the work, but more work nevertheless. >> >> This is a split off from https://debbugs.gnu.org/61667#587. I thought >> I recalled an existing report of vc-diff being slow, but apparently not. >> >> @@ -2883,9 +2883,6 @@ diff--get-revision-properties >> (buffer (cdr entry))) >> (if (buffer-live-p buffer) >> (progn >> - ;; Don't re-initialize the buffer (which would throw >> - ;; away the previous fontification work). >> - (setq file nil) >> (setq diff--cached-revision-buffers >> (cons entry >> (delq entry diff--cached-revision-buffers)))) >> @@ -2905,7 +2902,8 @@ diff--get-revision-properties >> (diff--cache-schedule-clean) >> (and buffer >> (with-current-buffer buffer >> - (diff-syntax-fontify-props file text line-nb))))) >> + ;; major mode is set in vc-find-revision-no-save already. >> + (diff-syntax-fontify-props nil text line-nb))))) > > Thanks, looks correct. Pushed to master, thanks.