From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.bugs Subject: bug#38456: 27.0.50; Assertion failure in 'smerge-match-conflict' Date: Sat, 18 Jan 2020 11:06:58 +0100 Message-ID: <87y2u5w01p.fsf@marxist.se> References: Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="118055"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: 38456@debbugs.gnu.org, Stefan Monnier To: martin rudalics Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Jan 18 11:08:14 2020 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 1isl1Z-000UfY-MT for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 18 Jan 2020 11:08:13 +0100 Original-Received: from localhost ([::1]:38758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isl1Y-00027l-CC for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 18 Jan 2020 05:08:12 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:46035) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isl1P-00027b-Lv for bug-gnu-emacs@gnu.org; Sat, 18 Jan 2020 05:08:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isl1O-0004Ze-M6 for bug-gnu-emacs@gnu.org; Sat, 18 Jan 2020 05:08:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:34553) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1isl1O-0004ZW-Hk for bug-gnu-emacs@gnu.org; Sat, 18 Jan 2020 05:08:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1isl1O-0004FI-Do for bug-gnu-emacs@gnu.org; Sat, 18 Jan 2020 05:08:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 18 Jan 2020 10:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38456 X-GNU-PR-Package: emacs Original-Received: via spool by 38456-submit@debbugs.gnu.org id=B38456.157934202916253 (code B ref 38456); Sat, 18 Jan 2020 10:08:02 +0000 Original-Received: (at 38456) by debbugs.gnu.org; 18 Jan 2020 10:07:09 +0000 Original-Received: from localhost ([127.0.0.1]:40526 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1isl0X-0004E5-76 for submit@debbugs.gnu.org; Sat, 18 Jan 2020 05:07:09 -0500 Original-Received: from ted.gofardesign.uk ([67.225.143.91]:36906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1isl0T-0004DZ-S8 for 38456@debbugs.gnu.org; Sat, 18 Jan 2020 05:07:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=marxist.se; s=default; h=Content-Type:MIME-Version:Message-ID:Date:References: In-Reply-To:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ATZwsi8FZlwgSWAKbkI8FZJCHtldvb4cLhWsKU6Eibs=; b=WsHvc4s7ED5v4nEsOfN9OQ91ID 7apmX+JyWdiRc8RaQcR4S3DQU93YPd3ydFDkCunCTv/9ZX5kG9KS1s8HdQXA9hsRZoCqQGBL2/hCf 2ENFfLvM2WaPZiLjijjuRlzUMbsRkZjMepp8Wv6da7fD7T2wg+ga8ag68cP83kqCBMJwwYV7nL/2h S1y02iifO1qn+E+mJZFH1Ka4pkfZE3LXbiQOps5MbnUV/Vf1e1vmw6getaYFnlwmeC19FkfVzTttF dhAFOjspnnwkuI8vbwLYfQ/DyOl0SvFXqJgmOWifkRov6QMzL85jQAJMjIi4XifTd/rhjhPoBkamJ LxSrSp4A==; Original-Received: from h-70-69.a785.priv.bahnhof.se ([155.4.70.69]:36026 helo=localhost) by ted.gofardesign.uk with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1isl0O-001uFR-15; Sat, 18 Jan 2020 05:07:00 -0500 In-Reply-To: (martin rudalics's message of "Mon, 2 Dec 2019 10:54:46 +0100") X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - ted.gofardesign.uk X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - marxist.se X-Get-Message-Sender-Via: ted.gofardesign.uk: authenticated_id: stefan@marxist.se X-Authenticated-Sender: ted.gofardesign.uk: stefan@marxist.se X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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:174804 Archived-At: martin rudalics writes: > Whenever git reports conflicts in a file, Emacs automatically enters > 'smerge-mode' when I visit that file and moves point to the first > conflict in its buffer. When 'debug-on-error' is non-nil and there is > no further conflict, typing C-c ^ n to invoke 'smerge-next' fails as > > Debugger entered--Lisp error: (cl-assertion-failed ((< orig-point (match-end 0)) nil)) > cl--assertion-failed((< orig-point (match-end 0))) > smerge-match-conflict() > smerge-refine() > smerge-next(1) > funcall-interactively(smerge-next 1) > call-interactively(smerge-next nil nil) > command-execute(smerge-next) > > Whatever that means, it makes Emacs behave erratically from now on, > like no more popping up menu bar items or not recognizing some of my > key bindings. Quitting the debugger mitigates that but apparently > still leaves 'smerge-mode' unusable and I have to revert the buffer. > Note that all this happens in a situation where I am usually more > occupied about the reasons of the conflicts and how to resolve them > then about how the underlying resolution mechanism works. > > I've been observing this behavior for years and never got around > reporting it because I always tried to understand the underlying > behaviors of 'smerge-match-conflict' and the debugger first. > Admittedly, I failed. Does anyone have an idea about what goes on > here internally and how to fix that? > > TIA, martin Copying in Stefan Monnier as the author of smerge. Best regards, Stefan Kangas