From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?utf-8?Q?Daniel_Mart=C3=ADn?= Newsgroups: gmane.emacs.devel Subject: Re: Which "on change" hooks `smerge-mode` hooks up to? Date: Thu, 01 Jun 2023 13:35:00 +0200 Message-ID: References: <6a3912855e18f2e6307e996996c4b19603568f9e.camel@yandex.ru> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="26963"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (darwin) Cc: emacs-devel To: Konstantin Kharlamov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Jun 01 13:36:02 2023 Return-path: Envelope-to: ged-emacs-devel@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 1q4gb4-0006os-9s for ged-emacs-devel@m.gmane-mx.org; Thu, 01 Jun 2023 13:36:02 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4gaT-0000uA-6H; Thu, 01 Jun 2023 07:35:26 -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 1q4gaN-0000t1-9h for emacs-devel@gnu.org; Thu, 01 Jun 2023 07:35:20 -0400 Original-Received: from sonic304-22.consmr.mail.ir2.yahoo.com ([77.238.179.147]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4gaJ-0004ok-Bm for emacs-devel@gnu.org; Thu, 01 Jun 2023 07:35:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.es; s=s2048; t=1685619304; bh=Q/KwwZ3HYKh8RFGHMC9WLXSulNM5LL5/ADK0alBzfH0=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From:Subject:Reply-To; b=LUTwAkg/ZC5kNNItkegL2T5BT/lfwxafTSmaIGpXE/ta59pXUsGyyXEU7WUMSPHPLku6GtD5SZ/OAAV2KcZvKbTXjyFMyI4tGs4K6eLwwtQ+qtGei3U8Wa2Uch799JrnEI+s9ZQdm1t3BZMWmEQ9Y0Xd9sQbYNmCug0Bg1A2j5LuyVl0rBh4zyVx43V803JeGCRgiiHUpV6Frt4e/ru9XOKxCoAEpkpnddOg49CXBhkGHvAbDoEOgFtyBfO6MXFoDdU1DAfsrZwLY0lFrFJGp95S4KIyPLQVUDWcRJbrOnt/huM0TPejoqT+Rdy8Y4KjR8xHr7I3vbkfA45RFmad/g== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1685619304; bh=cnn2zWrPuPuanJM0Nap6ajj4QirdSHpLN4Awvtq7WWR=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=mZwK4a86hwtR0uLgq077YKVFuXXT5iGMmEtnC5F9MsvMMxBHDgELKCof1v0XQwY5+FKcpZyz6oGpffy+PoXSwkFYKAGG92Wvb34LY/++3az/3lBqM2dmXYuYV6RloOkY7+GM2i4M1oesNtZY/sHH9lJwIf+MvErhzUDlPEJSmzidl/6YPccVhBJySyA4upwLkTXh72M6AQcadEi+otqm7DiKRkCcCAyC4xWphJVxeK+5efxy9an7hA5sa9zM4/hnIdtiVC9sLx3+8FZd95xsBLVlStHwWHeIF8YX+QCmfpi0EeQJ0h6sBpD1wuktlkl3Zapa4zUz6RbSdPbYLz6HDA== X-YMail-OSG: RmDLqEIVM1k4_SGxNYNIejJ00aOViY8NCXTPp_Vzzu4K7gBaGSqkxGRToq4Jw5B 5o6QEBNXbDqiI0SlprZCJdJSAwBjdMyjrgnn1rCj7auC9cJEH8uhy3QvHA9qX3C9VdxtB28C6xeM 1UDnMtozS1JmCXDPTYlbui8Ag4Sv.X0zNvLLjz6lpGXNkVQ0UwiYeQMUGeqDnejFNvkDkx2d96oD TidVn9gRB4WDVlOh1net3bhpY8lXNtqwyWdg1Zu3az5hNb9dchjxAfBID6EgJ5asf09bf813cjrH Zu7AbtLy5s2Yk5lw80vgM7tZ7w6QyjciiHb422gJYUZ3Uby7pZuXRsojvuliaTQsRiJ_KGiDKa_j k53PMvj5YgWvUijZOSp.3TxVKjjiiACPnsJzM5_cbzOYxNb_fGJax5wYbVi_1OndEotXlcTKbHHW vOpp0auAgTboFo7LPzoYzsjLQtCdZ2HuWSpYmFIT1Bfs9u6LIW4uZinrSEgq_xKNtMuhdGRqCCd8 5rw.PJkfBH2ON3vrzgSLyUJZNbVTYYugovi7oWFay_1b87eUUVlpKgS6mJ8YEgfNAM0JRdA5700p mfNtQB3ufneImyEs7oV6E00XdzVrRWXZrySVOR72A3cgQiYnwOT7WSuh1AtAwYWBMBnUDYzfo7hy VAU..SP6fO72A0FVFb2c_arupjRiyGJpiOvmEFnpwI1uv58IpyFy91Sgd6EAuYytnxwZcWJ88V.b kclqQdAh6HCYu22dZgScUNvp8Ku8MEUMbHv3DyPDwM5VQxg5Kqs1Qy.vpWWysBAiXcuHKmUon3nM PU7Gk1SUIk.Tz9m3G5ZpBE3ayROAK9j27oKk2d1MFE X-Sonic-MF: X-Sonic-ID: 860d0280-32f9-4a60-b202-8e5a3bef05b0 Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic304.consmr.mail.ir2.yahoo.com with HTTP; Thu, 1 Jun 2023 11:35:04 +0000 Original-Received: by hermes--production-ir2-7867f454fc-mmctx (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 916a9cf3d0e5267635e0c284c8de6cc6; Thu, 01 Jun 2023 11:35:02 +0000 (UTC) In-Reply-To: <6a3912855e18f2e6307e996996c4b19603568f9e.camel@yandex.ru> (Konstantin Kharlamov's message of "Wed, 31 May 2023 16:26:18 +0300") X-Mailer: WebService/1.1.21495 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo Received-SPF: pass client-ip=77.238.179.147; envelope-from=mardani29@yahoo.es; helo=sonic304-22.consmr.mail.ir2.yahoo.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 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-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:306506 Archived-At: Konstantin Kharlamov writes: > I spent some hours trying to debug a problem with highlight getting stuck and I > figured, might just ask at this point more acknowledgeable people. > > Problem I debug is basically, that in certain conditions a conflict marker > highlight gets stuck even after the marker was removed. > > I figured that I probably need smerge-mode to rescan the buffer if the buffer > was reverted (that only happens when autorevert is enabled). I presume smerge- > mode already does it because it usually removes highlight upon manually removing > conflict markers. And that logic probably has some bug in it. > > So, my question is, what "on change" hooks smerge-mode uses to detect that a > change to the buffer has been made to check whether conflict markers are still > in place? I tried searching for the word "hook" over the smerge-mode.el but > didn't find anything relevant. If font-lock is enabled, smerge-mode uses it to fontify the conflicting regions. See smerge-font-lock-keywords. So perhaps the regular font-lock debugging techniques might help you investigate this issue in more detail. Also, if you have some steps to reproduce it, you could also create a bug report by using M-x report-emacs-bug. Thanks.