From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Konstantin Kharlamov Newsgroups: gmane.emacs.devel Subject: Which "on change" hooks `smerge-mode` hooks up to? Date: Wed, 31 May 2023 16:26:18 +0300 Message-ID: <6a3912855e18f2e6307e996996c4b19603568f9e.camel@yandex.ru> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="28063"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Evolution 3.48.2 To: emacs-devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed May 31 15:27:18 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 1q4LrB-00076l-LM for ged-emacs-devel@m.gmane-mx.org; Wed, 31 May 2023 15:27:17 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4LqO-0005KK-Mh; Wed, 31 May 2023 09:26: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 1q4LqL-0005Jm-NK for emacs-devel@gnu.org; Wed, 31 May 2023 09:26:26 -0400 Original-Received: from forward101c.mail.yandex.net ([178.154.239.212]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q4LqI-000531-Sm for emacs-devel@gnu.org; Wed, 31 May 2023 09:26:25 -0400 Original-Received: from mail-nwsmtp-smtp-production-main-22.iva.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-22.iva.yp-c.yandex.net [IPv6:2a02:6b8:c0c:810d:0:640:1587:0]) by forward101c.mail.yandex.net (Yandex) with ESMTP id BB56C60066 for ; Wed, 31 May 2023 16:26:18 +0300 (MSK) Original-Received: by mail-nwsmtp-smtp-production-main-22.iva.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id IQN8u4gWs0U0-r5dZm5Ue; Wed, 31 May 2023 16:26:18 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1685539578; bh=Yy0XscnzaOs56eWZ3WuaPBccuNduq16IpeXDwlf0IP0=; h=Date:To:From:Subject:Message-ID; b=edLa0DCUpH4x2mNoKDbJ8FWREeBJJ0+K9Ae71cTaJfPIYxrLswBqGd7YTGEJlADPb ukl95byNrsoyFGpuepiSk6nEvyOY7sf6S5DHu2PjUjpsllgJbKqzr2j2YkxeKX8K3x tukCiavm9blxKbu+N/Qa26hO36Hjif96QCMgMBmE= Authentication-Results: mail-nwsmtp-smtp-production-main-22.iva.yp-c.yandex.net; dkim=pass header.i=@yandex.ru Received-SPF: pass client-ip=178.154.239.212; envelope-from=hi-angel@yandex.ru; helo=forward101c.mail.yandex.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_FROM=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:306444 Archived-At: I spent some hours trying to debug a problem with highlight getting stuck a= nd 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 buff= er was reverted (that only happens when autorevert is enabled). I presume smer= ge- mode already does it because it usually removes highlight upon manually rem= oving 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 st= ill in place? I tried searching for the word "hook" over the smerge-mode.el but didn't find anything relevant.