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: Re: Which "on change" hooks `smerge-mode` hooks up to? Date: Wed, 14 Jun 2023 14:49:02 +0300 Message-ID: References: <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="26952"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Evolution 3.48.2 Cc: emacs-devel To: Daniel =?ISO-8859-1?Q?Mart=EDn?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Jun 14 13:49:57 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 1q9P0f-0006pD-9h for ged-emacs-devel@m.gmane-mx.org; Wed, 14 Jun 2023 13:49:57 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q9Ozv-0007AR-LD; Wed, 14 Jun 2023 07:49:11 -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 1q9Ozu-0007AH-6n for emacs-devel@gnu.org; Wed, 14 Jun 2023 07:49:10 -0400 Original-Received: from forward501c.mail.yandex.net ([178.154.239.209]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q9Ozs-0006z2-5B for emacs-devel@gnu.org; Wed, 14 Jun 2023 07:49:09 -0400 Original-Received: from mail-nwsmtp-smtp-production-main-54.iva.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-54.iva.yp-c.yandex.net [IPv6:2a02:6b8:c0c:1380:0:640:6985:0]) by forward501c.mail.yandex.net (Yandex) with ESMTP id 95CB95EE93; Wed, 14 Jun 2023 14:49:03 +0300 (MSK) Original-Received: by mail-nwsmtp-smtp-production-main-54.iva.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id 2nZ09m4WuCg0-WqLe9RzZ; Wed, 14 Jun 2023 14:49:03 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1686743343; bh=ee9YsHm6H4IU7bVGX53wP06kFD797XKdGUhB4DjilKs=; h=References:Date:In-Reply-To:Cc:To:From:Subject:Message-ID; b=dD+9KT6BpRvgNpjGUr4H0zyJrGdSMdNPc0Y4hPuw/UhYKuz48cjtRG6+RyK30OcKK flWQJRyMXX33Vssl+cMzHE0hlaC5z+uuiw4f8q1NunW2oQW6VHMGYQn7N7o3quzSUh UBYNebpEc/G9FwnY8cU1sTFudRViwU4Pe8KxG+1Q= Authentication-Results: mail-nwsmtp-smtp-production-main-54.iva.yp-c.yandex.net; dkim=pass header.i=@yandex.ru In-Reply-To: Received-SPF: pass client-ip=178.154.239.209; envelope-from=hi-angel@yandex.ru; helo=forward501c.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:306795 Archived-At: On Thu, 2023-06-01 at 13:35 +0200, Daniel Mart=C3=ADn wrote: > Konstantin Kharlamov writes: >=20 > > I spent some hours trying to debug a problem with highlight getting stu= ck > > and I > > figured, might just ask at this point more acknowledgeable people. > >=20 > > Problem I debug is basically, that in certain conditions a conflict mar= ker > > highlight gets stuck even after the marker was removed. > >=20 > > 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. > >=20 > > So, my question is, what "on change" hooks smerge-mode uses to detect t= hat a > > change to the buffer has been made to check whether conflict markers ar= e > > still > > in place? I tried searching for the word "hook" over the smerge-mode.el= but > > didn't find anything relevant. >=20 > If font-lock is enabled, smerge-mode uses it to fontify the conflicting > regions.=C2=A0 See smerge-font-lock-keywords.=C2=A0 So perhaps the regula= r > font-lock debugging techniques might help you investigate this issue in > more detail. I see, thanks > Also, if you have some steps to reproduce it, you could also create a > bug report by using M-x report-emacs-bug.=C2=A0 Thanks. Sorry it took so long, got stuck in some personal stuff. I reported a bug h= ere https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D64063