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.bugs,gmane.emacs.devel Subject: bug#64063: smerge-mode highlight gets stuck if buffer autoreverted "delicately" Date: Sat, 17 Jun 2023 03:16:32 +0300 Message-ID: References: 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="6171"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Evolution 3.48.2 Cc: mardani29@yahoo.es, emacs-devel@gnu.org To: 64063@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Jun 17 02:17:17 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 1qAJcz-0001Sc-5K for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 17 Jun 2023 02:17:17 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAJcp-0000cS-DF; Fri, 16 Jun 2023 20:17:07 -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 1qAJck-0000c0-Mn for bug-gnu-emacs@gnu.org; Fri, 16 Jun 2023 20:17:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qAJck-0006DK-BL for bug-gnu-emacs@gnu.org; Fri, 16 Jun 2023 20:17:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qAJck-000146-6z for bug-gnu-emacs@gnu.org; Fri, 16 Jun 2023 20:17:02 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: Resent-From: Konstantin Kharlamov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 17 Jun 2023 00:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64063 X-GNU-PR-Package: emacs Original-Received: via spool by 64063-submit@debbugs.gnu.org id=B64063.16869609994062 (code B ref 64063); Sat, 17 Jun 2023 00:17:02 +0000 Original-Received: (at 64063) by debbugs.gnu.org; 17 Jun 2023 00:16:39 +0000 Original-Received: from localhost ([127.0.0.1]:50594 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAJcN-00013S-6f for submit@debbugs.gnu.org; Fri, 16 Jun 2023 20:16:39 -0400 Original-Received: from forward102c.mail.yandex.net ([178.154.239.213]:39558) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAJcK-00013G-CR for 64063@debbugs.gnu.org; Fri, 16 Jun 2023 20:16:38 -0400 Original-Received: from mail-nwsmtp-smtp-production-main-33.iva.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-33.iva.yp-c.yandex.net [IPv6:2a02:6b8:c0c:7c8d:0:640:daf4:0]) by forward102c.mail.yandex.net (Yandex) with ESMTP id 1DE9F60025; Sat, 17 Jun 2023 03:16:34 +0300 (MSK) Original-Received: by mail-nwsmtp-smtp-production-main-33.iva.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id WGRgxgGDaSw0-So7YExPU; Sat, 17 Jun 2023 03:16:33 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1686960993; bh=Cyy3LCIUR5aQmMWkv4RXrIE0KI7lrJGNPtd8wMsQPcw=; h=Date:Cc:To:From:Subject:Message-ID; b=efcBB+Q/sLe9WfD52BTRZfrJk1yMoWPegQhb62eCKHl7QSiWufQHE/4ZnpKxc8JD5 B9CAef31Vm0nQDCCYexHtWdKeoVuRLdBYS8MY8AFRJSlSq+SszKN5lfb4wt1LZ6ATT 5qVgsZMcJBNx1f3okm/Y6Brm/Rc6wBw2+fYjlWoc= Authentication-Results: mail-nwsmtp-smtp-production-main-33.iva.yp-c.yandex.net; dkim=pass header.i=@yandex.ru 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:263492 gmane.emacs.devel:306844 Archived-At: On Thu, 2023-06-01 at 13:35 +0200, Daniel Mart=C3=ADn wrote: > > 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. > > 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. So, I think the problem is that the highlight that gets stuck does not use = font-lock, or at least not through means of `smerge-font-lock-keywords`. Whatever is d= efined in `smerge-font-lock-keywords` gets unhighlighted correctly. But the part that= gets stuck instead is an overlay. So I presume besides font-lock-mode there's some other highlight management= ongoing, the one that decides whether to put/remove overlays over some text.