From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#38456: 27.0.50; Assertion failure in 'smerge-match-conflict' Date: Tue, 21 Jan 2020 14:24:23 -0500 Message-ID: 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="9454"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: 38456@debbugs.gnu.org To: martin rudalics Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Jan 21 20:25:13 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 1itz9E-0002IQ-Ux for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 21 Jan 2020 20:25:12 +0100 Original-Received: from localhost ([::1]:60054 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itz9D-0003yz-Om for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 21 Jan 2020 14:25:11 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:60700) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itz95-0003yj-Rs for bug-gnu-emacs@gnu.org; Tue, 21 Jan 2020 14:25:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itz94-0000mn-Fg for bug-gnu-emacs@gnu.org; Tue, 21 Jan 2020 14:25:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:42537) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itz94-0000mi-8y for bug-gnu-emacs@gnu.org; Tue, 21 Jan 2020 14:25:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1itz94-0006GS-5U for bug-gnu-emacs@gnu.org; Tue, 21 Jan 2020 14:25:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 21 Jan 2020 19:25: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.157963467524019 (code B ref 38456); Tue, 21 Jan 2020 19:25:02 +0000 Original-Received: (at 38456) by debbugs.gnu.org; 21 Jan 2020 19:24:35 +0000 Original-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 Original-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 Original-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) Original-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== Original-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) In-Reply-To: (martin rudalics's message of "Mon, 2 Dec 2019 10:54:46 +0100") 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:175025 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) 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))