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 Subject: bug#46876: [PATCH] Find conflict markers in opened buffers as well Date: Tue, 02 Mar 2021 22:37:10 +0300 Message-ID: References: <20210302162349.709999-1-Hi-Angel@yandex.ru> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="38582"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Evolution 3.38.4 To: 46876@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Mar 02 20:38:09 2021 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 1lHAqP-0009um-7V for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 02 Mar 2021 20:38:09 +0100 Original-Received: from localhost ([::1]:51502 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHAqO-0006zf-9q for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 02 Mar 2021 14:38:08 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:57760) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHAqI-0006zT-Ml for bug-gnu-emacs@gnu.org; Tue, 02 Mar 2021 14:38:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:42686) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lHAqI-0005m5-Ft for bug-gnu-emacs@gnu.org; Tue, 02 Mar 2021 14:38:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lHAqI-00036d-Cz for bug-gnu-emacs@gnu.org; Tue, 02 Mar 2021 14:38:02 -0500 X-Loop: help-debbugs@gnu.org In-Reply-To: <20210302162349.709999-1-Hi-Angel@yandex.ru> Resent-From: Konstantin Kharlamov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 02 Mar 2021 19:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46876 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 46876-submit@debbugs.gnu.org id=B46876.161471384111890 (code B ref 46876); Tue, 02 Mar 2021 19:38:02 +0000 Original-Received: (at 46876) by debbugs.gnu.org; 2 Mar 2021 19:37:21 +0000 Original-Received: from localhost ([127.0.0.1]:54232 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lHApc-00035i-QD for submit@debbugs.gnu.org; Tue, 02 Mar 2021 14:37:21 -0500 Original-Received: from forward104j.mail.yandex.net ([5.45.198.247]:39080) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lHApa-00035T-QW for 46876@debbugs.gnu.org; Tue, 02 Mar 2021 14:37:20 -0500 Original-Received: from myt5-1892386aa303.qloud-c.yandex.net (myt5-1892386aa303.qloud-c.yandex.net [IPv6:2a02:6b8:c12:4323:0:640:1892:386a]) by forward104j.mail.yandex.net (Yandex) with ESMTP id E46374A016D for <46876@debbugs.gnu.org>; Tue, 2 Mar 2021 22:37:11 +0300 (MSK) Original-Received: from myt3-07a4bd8655f2.qloud-c.yandex.net (myt3-07a4bd8655f2.qloud-c.yandex.net [2a02:6b8:c12:693:0:640:7a4:bd86]) by myt5-1892386aa303.qloud-c.yandex.net (mxback/Yandex) with ESMTP id EEGFalT5Hs-bBIS8xXc; Tue, 02 Mar 2021 22:37:11 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1614713831; bh=RssG4nlBKz7MhZcqXOS1/GN3oOkfsxHchKbEWxkQdes=; h=To:From:Subject:Message-ID:Date; b=ReTGd0RPPfrRABw4ijYhqeWnmAYFDkB3SrcMCOMCvZyIKJE9qpcAwJyaUa00QLqvn w6d0OmBNXW7LUJI/C+H40SJdEkpqFAvf85jkGoTVw1dqn32+MmQupEwOdkyoEwwbk/ ZE5djChzg/DKy/aAFkEYCbjUXE91YV6k9jLEv69I= Authentication-Results: myt5-1892386aa303.qloud-c.yandex.net; dkim=pass header.i=@yandex.ru Original-Received: by myt3-07a4bd8655f2.qloud-c.yandex.net (smtp/Yandex) with ESMTPSA id 43x5Z4QtZm-bBne8Rj6; Tue, 02 Mar 2021 22:37:11 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) 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" Xref: news.gmane.io gmane.emacs.bugs:201233 Archived-At: Hello! Sorry, it seems like debbugs notifications got broken, at least for me. I never got a notifications about this report creation; and it seems not a coincidence because while working with bug #46400 at some point notifications stopped coming in. I'll create a separate report on this, but please add me to CC for now because otherwise I can't know if someone is replying. With that said, right after I sent the patch I figured there an unused variable appeared after my changes, so I'll sent in a moment the newer version of the changes, with it removed.