From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: martin rudalics Newsgroups: gmane.emacs.bugs Subject: bug#38456: 27.0.50; Assertion failure in 'smerge-match-conflict' Date: Mon, 2 Dec 2019 10:54:46 +0100 Message-ID: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="217713"; mail-complaints-to="usenet@blaine.gmane.org" To: 38456@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Dec 02 10:55:36 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1ibiQZ-000uRV-EG for geb-bug-gnu-emacs@m.gmane.org; Mon, 02 Dec 2019 10:55:35 +0100 Original-Received: from localhost ([::1]:33026 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibiQX-0006NA-Ug for geb-bug-gnu-emacs@m.gmane.org; Mon, 02 Dec 2019 04:55:34 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:57465) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibiQ3-0006J8-GI for bug-gnu-emacs@gnu.org; Mon, 02 Dec 2019 04:55:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibiQ2-0007Qz-Ei for bug-gnu-emacs@gnu.org; Mon, 02 Dec 2019 04:55:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:59367) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ibiQ2-0007Qt-B2 for bug-gnu-emacs@gnu.org; Mon, 02 Dec 2019 04:55:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ibiQ2-0003HN-9L for bug-gnu-emacs@gnu.org; Mon, 02 Dec 2019 04:55:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: martin rudalics Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 02 Dec 2019 09:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 38456 X-GNU-PR-Package: emacs X-Debbugs-Original-To: Bug-Gnu-Emacs Original-Received: via spool by submit@debbugs.gnu.org id=B.157528049312583 (code B ref -1); Mon, 02 Dec 2019 09:55:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 2 Dec 2019 09:54:53 +0000 Original-Received: from localhost ([127.0.0.1]:37107 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ibiPt-0003Gt-3p for submit@debbugs.gnu.org; Mon, 02 Dec 2019 04:54:53 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:47896) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ibiPr-0003Gl-HY for submit@debbugs.gnu.org; Mon, 02 Dec 2019 04:54:51 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:57404) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibiPq-0005xm-8R for bug-gnu-emacs@gnu.org; Mon, 02 Dec 2019 04:54:51 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibiPp-0007IP-5T for bug-gnu-emacs@gnu.org; Mon, 02 Dec 2019 04:54:50 -0500 Original-Received: from mout.gmx.net ([212.227.15.19]:37333) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ibiPo-0007Hr-Ow for bug-gnu-emacs@gnu.org; Mon, 02 Dec 2019 04:54:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1575280487; bh=LIVubTbmU901CN1c4v0ypyiLtGBKLvOAhG7WaIQrQLI=; h=X-UI-Sender-Class:From:Subject:To:Date; b=UEct6YO03iC46gnvAk/Kl3GNKd6LAYZsZJ6Q78ke/4WpmJBMMvd5zhW4LTTu69g4y Rzz9uVsEcPRYFr7ZtLmNKfcTQKvM4jagBtLSn2dvslwaNicx9i3Z+2DYVJ8oKuF3Jv mAooYkbHm0vLTJ35hPii31xhnCci33KDIQYC8BWk= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Original-Received: from [192.168.1.101] ([46.125.249.45]) by mail.gmx.com (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MHoN2-1iWmC82qhC-00Ew7N for ; Mon, 02 Dec 2019 10:54:46 +0100 Content-Language: de-AT X-Provags-ID: V03:K1:FtN/xUnhUs+pcdxza370SxJ2ZYX7Jl6dzrxpXLbaOwom8mBvSoB OuPQh+h4YuUl/Bq4bsUQtifzKs8GPPDA3vYDmPIenSNCmeFw5CKeh6jMdA9SkfyFJ7vKXko RsuKeyp/JRt46iG4x9XPBVjPFjbg4qbpgWVfv9slxwjqCC8Ev1GLPLIOU0xhvoUDN6khrT6 mIVKOvLSx1Aku76WfchoQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:zQ+htduts0Q=:vT69eKcDtV84GwAvoarGEi nNFhC9y6EGVcANp8dup8K7jbcaCR03VVw32hN8MqgiHTylLXLbkN5RztChW+ovqKyeJodSrOB jvxpZjIdY1VNkO5gnVXPtjo4YYRMcAUZBXmLN2LmSwGfda3PT35ttE1t2gLv6XNDuV5Jztqb6 TlqVXWkqWcYVzkn6PHscGhljbySCu+WTOwSvSOYcYHcwxv0cLlb0cu28tSzbTsC5jlbtQgqs0 nIcL2cynYh4MJf3PHprR6sgpqP8m1h7+BlnVXD47tKrDktbMqJApOT6cm7zeG0xWqtXyE2Q7b QdgKiNrcWda3dIYzsiPrHa/7aVQTJ/TvmYQG3tuF+C2C+skRhVchfCOpqfoFDpOILQQcIozqu RKFtC79itK8Vc7CPVQUGAkFksauCzlMJ2JMoj+NTB+E3yMoLtKKCDE29+SdszBbzhW27Z73e/ 0cT80ruPavO+Pq5OFfS2EssI8XBm3ZiGOjfZ5nSMbdp04ZuTWdB25zM8m78z2esB/vs7d/4W/ j7LCcS03ozBzjDR6byXSsF2UN23fwqvhrBf7Fai0nS85+PsjfJgwAKggpZ+Xy0IGUUjI4IFLv XRROPa6op+OjpKsTeYKCCV6LTZD1ZbVDI+kXRQXmnou55qH210PC+AaC3GX2WL2qMLA0AzYZl 1tOfvUOvK5t33PJ0bQqZKE/yCtlR+w/Ym+eebT5ZSekrqWrEkdKRNr7RfNQItwCxPXDrY2m2K LEAZH/9twCY6qUgWWR4+n9EWe+BNShPxk+eBtzu7Shiy1onvLDmymB67W2RSXuuoBdbq9nPu X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] 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.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:172757 Archived-At: 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 In GNU Emacs 27.0.50 (build 63, x86_64-w64-mingw32) of 2019-12-01 built on MACHNO