From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 02 04:54:53 2019 Received: (at submit) by debbugs.gnu.org; 2 Dec 2019 09:54:53 +0000 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 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 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 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: ** X-Spam-Status: No, score=2.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, SPOOFED_FREEMAIL autolearn=disabled version=3.3.2 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 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 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 From: martin rudalics Subject: 27.0.50; Assertion failure in 'smerge-match-conflict' To: Bug-Gnu-Emacs Message-ID: Date: Mon, 2 Dec 2019 10:54:46 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: de-AT Content-Transfer-Encoding: 7bit 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+eBtzu7Shiy1onvLDmymB67W2RSXuuoBdbq9nPus sXSsmFEozXPAC1OxZcD2gktN5ykPANj7SULj90qQXsiQnKwQDg4uLAAQx6GVgx/SAtbkaNQQf +bFf7/lduwiTs+e0dlsfKVNdfIJXyYKaQdqrMZ+DfyEunRFCNsrB3XMJqSkSNAMS/ry4wFMb6 P8kIDE7MRHPH8UcesWNWyy1Hlv4u1WTLhr2lVAo/g7glZHlelsiWl96VQh13m4UPYWShr+DAG dAKQ59fiI8GcEoG2f+Og1NO5G5vvoYbF643X5XI9M0cF7RjoAyeh20XLlV8zVCf8FEkjyl5mt 5Kny+a/BfNIlGOnD+Fn9Wg4JjZKYmqad2VdfzvlqFFRUIOjXEaVygzsH+JDeJl1KYUtlvlY5T xxsqgbWmTOwfSRWZVFx0TSjH+rh+jWWPU81itkpqB2W5k9tGxLbb0GR9zDqu33Ue2TJyEBlmO dBhFXLOcxshH15r95rKTnSwaOwChZFeomhtQb+HsgF4LkwDI2EPE5yle0O9s= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.15.19 X-Spam-Score: 0.6 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) 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 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 18 05:07:09 2020 Received: (at 38456) by debbugs.gnu.org; 18 Jan 2020 10:07:09 +0000 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 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==; 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 From: Stefan Kangas To: martin rudalics Subject: Re: bug#38456: 27.0.50; Assertion failure in 'smerge-match-conflict' In-Reply-To: (martin rudalics's message of "Mon, 2 Dec 2019 10:54:46 +0100") References: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Date: Sat, 18 Jan 2020 11:06:58 +0100 Message-ID: <87y2u5w01p.fsf@marxist.se> MIME-Version: 1.0 Content-Type: text/plain 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-Source: X-Source-Args: X-Source-Dir: X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 38456 Cc: 38456@debbugs.gnu.org, Stefan Monnier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 21 14:24:35 2020 Received: (at 38456) by debbugs.gnu.org; 21 Jan 2020 19:24:35 +0000 Received: from localhost ([127.0.0.1]:48510 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1itz8c-0006FL-Sf for submit@debbugs.gnu.org; Tue, 21 Jan 2020 14:24:35 -0500 Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:48668) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1itz8b-0006F9-1h for 38456@debbugs.gnu.org; Tue, 21 Jan 2020 14:24:34 -0500 Received: from pmg3.iro.umontreal.ca (localhost [127.0.0.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 746084401D5; Tue, 21 Jan 2020 14:24:27 -0500 (EST) Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id E8933440057; Tue, 21 Jan 2020 14:24:25 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1579634665; bh=BBoStNYUJcHfkImy65VoPjATub+ZZ/hggqOwX3ruu0Y=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=kVwX4rXSswxuEp/G7pnuyOECpS07Q5mYMeSDsjxeJrPWXKt2CLXe34qpin1aLuyy/ aQqNlO6iuaih5BS4Ki9bXRWuXriVDCTx+yNFcq40/V5/nyOgzxdzD9fOv/Qyi5VZ3N b9ZiFWyljkaMEoPnX26siwCl6b3QUp7tCHQCiF7D/+WX2U8yh90PDq6LJhBMmQU9cX 8XsBwFcVnkrrGWL69ka9lh8AY/5mCN8l8IsF6UZcR+6NY4TzxLEmxjtvSqOuiDcgq5 x8hNksZeXvtkI/0QKs7fNSyvXiRvQdfbLVetr2OPMKevVtW2iwU2QxQVckd7VFFMfh Q83YPIees+S6A== Received: from lechazo (lechon.iro.umontreal.ca [132.204.27.242]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id B14BD1203C3; Tue, 21 Jan 2020 14:24:25 -0500 (EST) From: Stefan Monnier To: martin rudalics Subject: Re: bug#38456: 27.0.50; Assertion failure in 'smerge-match-conflict' Message-ID: References: Date: Tue, 21 Jan 2020 14:24:23 -0500 In-Reply-To: (martin rudalics's message of "Mon, 2 Dec 2019 10:54:46 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-SPAM-INFO: Spam detection results: 0 ALL_TRUSTED -1 Passed through trusted hosts only via SMTP AWL -0.060 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature DKIM_VALID_AU -0.1 Message has a valid DKIM or DK signature from author's domain X-SPAM-LEVEL: X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 38456 Cc: 38456@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > 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) Oh, yes, thank you. I've suffered through those many times as well ;-) The patch below should fix it. Eli, is it OK to put it into `emacs-27`? OT1H it's an old bug, so there's no urgency, but OTOH it's "obviously safe" (turns an assertion failure into a `search-failed` signal). Stefan diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index d4984bbd38..85868b91ec 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -797,7 +797,10 @@ smerge-match-conflict (filename (or (match-string 1) "")) (_ (re-search-forward smerge-end-re)) - (_ (cl-assert (< orig-point (match-end 0)))) + (_ (when (< (match-end 0) orig-point) + ;; Point is not within the conflict we found, + ;; so this conflict is not ours. + (signal 'search-failed (list smerge-begin-re)))) (lower-end (match-beginning 0)) (end (match-end 0)) From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 21 14:54:15 2020 Received: (at 38456) by debbugs.gnu.org; 21 Jan 2020 19:54:15 +0000 Received: from localhost ([127.0.0.1]:48523 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1itzbL-0006z9-Km for submit@debbugs.gnu.org; Tue, 21 Jan 2020 14:54:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55585) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1itzbI-0006ys-5S for 38456@debbugs.gnu.org; Tue, 21 Jan 2020 14:54:14 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:52770) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1itzbC-0000uJ-FG; Tue, 21 Jan 2020 14:54:06 -0500 Received: from [176.228.60.248] (port=1842 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1itzbB-0000OL-Ha; Tue, 21 Jan 2020 14:54:06 -0500 Date: Tue, 21 Jan 2020 21:54:16 +0200 Message-Id: <83lfq0vb4n.fsf@gnu.org> From: Eli Zaretskii To: Stefan Monnier In-reply-to: (message from Stefan Monnier on Tue, 21 Jan 2020 14:24:23 -0500) Subject: Re: bug#38456: 27.0.50; Assertion failure in 'smerge-match-conflict' References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 38456 Cc: rudalics@gmx.at, 38456@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Stefan Monnier > Date: Tue, 21 Jan 2020 14:24:23 -0500 > Cc: 38456@debbugs.gnu.org > > Eli, is it OK to put it into `emacs-27`? Yes, thanks. From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 21 15:59:14 2020 Received: (at 38456-done) by debbugs.gnu.org; 21 Jan 2020 20:59:14 +0000 Received: from localhost ([127.0.0.1]:48554 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iu0cE-0002A4-CC for submit@debbugs.gnu.org; Tue, 21 Jan 2020 15:59:14 -0500 Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:13303) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iu0cD-00029q-6g for 38456-done@debbugs.gnu.org; Tue, 21 Jan 2020 15:59:13 -0500 Received: from pmg2.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id AB181811E8; Tue, 21 Jan 2020 15:59:07 -0500 (EST) Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 0B4F98109E; Tue, 21 Jan 2020 15:59:06 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1579640346; bh=eAmsKdu2LgDpzf+GiTG6aFYr4dFJPB+kdw+QZmFqY2k=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=ZniAK3qMR7RiW0HfMgtJyYo1QCItG6O3xwqY/FQVTBdJdXKuTgDms9A03f6mpD8pK rJz1KCwp8V/3uWVxhbAYpXAIEQo0krNRlDbykxefsVP/x0KLP/qY6Ke1OcaeOfvKxU /Ku+QyBBCOoMcTSMqAfFWNCO4y7HZfh7kTPZlr4BRghT/YhF1z3K5OCkT3p/Ur3tko zHdI9Bittseo0K//V8Mspem+dvagoE9mZfnRQHRXB5tpKl7BHfQb3SFoWGe/51HzqG 2LXubKVXzBcacJwLd5BGYSoieD7/1mav1v0KmWaSPQLS4QdayjbExgYUrkK2PE5iz0 GXBRHr/BcLIlg== Received: from lechazo (lechon.iro.umontreal.ca [132.204.27.242]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id DF9FD120484; Tue, 21 Jan 2020 15:59:05 -0500 (EST) From: Stefan Monnier To: Eli Zaretskii Subject: Re: bug#38456: 27.0.50; Assertion failure in 'smerge-match-conflict' Message-ID: References: <83lfq0vb4n.fsf@gnu.org> Date: Tue, 21 Jan 2020 15:59:04 -0500 In-Reply-To: <83lfq0vb4n.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 21 Jan 2020 21:54:16 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-SPAM-INFO: Spam detection results: 0 ALL_TRUSTED -1 Passed through trusted hosts only via SMTP AWL 0.007 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature DKIM_VALID_AU -0.1 Message has a valid DKIM or DK signature from author's domain X-SPAM-LEVEL: X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 38456-done Cc: rudalics@gmx.at, 38456-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) >> Eli, is it OK to put it into `emacs-27`? > Yes, thanks. Done, Stefan From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 22 12:45:09 2020 Received: (at 38456) by debbugs.gnu.org; 22 Jan 2020 17:45:09 +0000 Received: from localhost ([127.0.0.1]:51263 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iuK3x-0000xe-JT for submit@debbugs.gnu.org; Wed, 22 Jan 2020 12:45:09 -0500 Received: from mout.gmx.net ([212.227.15.19]:47729) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iuK3v-0000xC-IS for 38456@debbugs.gnu.org; Wed, 22 Jan 2020 12:45:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1579715099; bh=lfNtjQJoXkc0VVvXS8zlUCx6GuO7fhhsYcRt9N4f2oc=; h=X-UI-Sender-Class:Subject:To:Cc:References:From:Date:In-Reply-To; b=F1BVR+C5W67FsMIQWkmrspfVN0keM+AEgjIzZRS6/mP9GwRrHMd4TN4UgvQqtIKcQ xdyRJhcYlBqk+s0U92suM5wYE7vIVu66UimK2yUUg1Lc2On302ZYu3tj3MC4yzCWqc ZBSLTOnbuG/EKPoDpQvrOiA16aLCxefzvpUr7LMU= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [192.168.1.100] ([46.125.249.67]) by mail.gmx.com (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MAwXr-1ijcp945kH-00BHh6; Wed, 22 Jan 2020 18:44:59 +0100 Subject: Re: bug#38456: 27.0.50; Assertion failure in 'smerge-match-conflict' To: Stefan Monnier References: From: martin rudalics Message-ID: <900e8d92-2130-013d-b917-73829e2d130e@gmx.at> Date: Wed, 22 Jan 2020 18:44:56 +0100 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K1:/1BM8BYNYDuL3EQR97zXvoHaqrN7xZNHlMI5PF0PpdKeBpQ47zO OxTQJwGQoELkczP6vxmy53PPpbRFbaT9g7DQxBtL2farA0bG3JodPYuQUjpe0KkMpKO6ICh RyZ3qc+2Nlf3kI3VNUPRuPL1RJQPl+6T9HVdnGDgb9YDMTutzmvr+QvfPHOzZ/jXiXYQoBs VTmCG3EM7Wra3oHG8HJIg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:RYK43khUaWw=:1IwSHvA7wDMDTRLteAbH9w bg1DEj/aBZ6PhzgyV+RRcTxmGpIGwHBJ03FZ1dPog2LzmFpZg94PP4NpGztzhA0pCBHj3+8FB hgOLfcobdE2q9pXYo5AOR3rhpzhW8pieREPNY0XQLF/HW0te3oPdXBOOQYz2wnkLNj07kOfO1 xnOBMTjCSrZCJBPP4IKVx1Fikh0KBuQ4COUXBZAluiebYEXKlxdh2KiYIfV4H6U7c0g3Iwxpf 3grNPuzouLySxZmjYZiJjiuQ8lepyt+YHJIUc2Hl+NrmJle50lem7/QWKovak/xdwiMHcXqiR okajLpHiu7njwqQ9khquHUTaEGBPp3Zznvp6SQorfldeKo13eQMbY3aSZvLaEWkFK4VfPQrgf 9pu0QMYnF2D0RlybRE7/N0yldOfIV3pV+Zd75gZHdOZHXKphNAxiL7/tCN3sdIPedfzZi9MVZ Smvqh4AiqEjohePXY4sa779H3lwl5snoq2J3MkNYv3fdzik4yD+CiO5A4+WyminyeVrPkvba8 8s/HmqJDlMFXBgqCUcWA7uKb05ehzqSABcv4TrFvdj8C5cYuNy+0TptK2u4KWNTWAplnjAfGP gyA7AKiAdilAkLL3bUsscsYteMaNUzhp1XXRRuNz0DphYHk3TGH70MgxYmATlTU2tUVl3T+gJ 8NOLHDUegiA+c4TTZYK0uZ4NwmOCDDsTKd+8m2JHwAwV24pgZIUGxJZt94/10GzL63swIbHbG a0UmgnJBmyv+vvruOtvAFj8dUSEcvCT61+cVVi2/VGfFVRj0MvxoJqcwMq9vgDrnN531iibRv KHaGXDSGEVU73GqXjhzZmajnbc66I8jDFIJCHTxfUM3x3X//Lw0+Rd8J5EV/eqmIlgHjIAd5J T0ejPHOlO3LrjYsRKyahMTOvjEduBfGNdSNEnaZ+p8gXdrw0YA0CclIgSTfG1YRMPG4bsSFTc CP8gMtMSIEToOLAOlpYGnzAzGEGMcOv8MPV/kOaB2/PMfPuigUMbfvE96R0IHNNNSoUA/e/8Z BImXFgKbweprRLl+ohXzyMhyga1riyr0s3lqWrRuCERjlNuaL8mw+Jm7vHP+7oggBiGCGVAWD 8REZwBI1rNR/faHhF/CgvZtsClXAqD71xEyeYqWM3BYmVGLJi2eTBCihPuWKow+zYpT+KEZ0p dfsp6mEehHReMrn1NvG4P3x2+IkkRFRiaf2CpH116qwdtpZrKjGdMTd+zNjrgYahetGUM= X-Spam-Score: 1.5 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: > Oh, yes, thank you. I've suffered through those many times as well ;-) > The patch below should fix it. Thanks for the fix. I'll check the next time I see a conflict. One thing that should be fixed too, if easily possible, is to gray out the previous/next conflict menu entries whenever we are at the fir [...] Content analysis details: (1.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.5 RCVD_IN_SORBS_WEB RBL: SORBS: sender is an abusable web server [46.125.249.67 listed in dnsbl.sorbs.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.15.19 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (rudalics[at]gmx.at) -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 38456 Cc: 38456@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) > Oh, yes, thank you. I've suffered through those many times as well ;-) > The patch below should fix it. Thanks for the fix. I'll check the next time I see a conflict. One thing that should be fixed too, if easily possible, is to gray out the previous/next conflict menu entries whenever we are at the first/last conflict. Smerging can be a painful job (often enough I don't even know whether the upper or lower represents the one I want to keep) so avoiding any possible confusions should be a main goal IMHO. martin From unknown Sat Sep 13 03:53:13 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 20 Feb 2020 12:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator