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#46538: Patch: wrap around smerge-vc-next-conflict if current file still has conflicts Date: Mon, 15 Feb 2021 21:51:41 +0300 Message-ID: <5d10180be5f6a5a23c91b0ed150c111a225d79ff.camel@yandex.ru> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-SFFqjDc149lkWpt3bYqg" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="30381"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Evolution 3.38.4 To: 46538@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Feb 15 19:53:11 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 1lBize-0007lU-Iz for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 15 Feb 2021 19:53:10 +0100 Original-Received: from localhost ([::1]:45180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBizd-0008NM-G7 for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 15 Feb 2021 13:53:09 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:53286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBizW-0008NA-8b for bug-gnu-emacs@gnu.org; Mon, 15 Feb 2021 13:53:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:55385) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lBizW-00083Q-0b for bug-gnu-emacs@gnu.org; Mon, 15 Feb 2021 13:53:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lBizV-0008O0-UP for bug-gnu-emacs@gnu.org; Mon, 15 Feb 2021 13:53:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Konstantin Kharlamov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 15 Feb 2021 18:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46538 X-GNU-PR-Package: emacs X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.161341512232163 (code B ref -1); Mon, 15 Feb 2021 18:53:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 15 Feb 2021 18:52:02 +0000 Original-Received: from localhost ([127.0.0.1]:38698 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBiyW-0008MO-TY for submit@debbugs.gnu.org; Mon, 15 Feb 2021 13:52:02 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:46132) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBiyS-0008ME-Ti for submit@debbugs.gnu.org; Mon, 15 Feb 2021 13:51:59 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:53144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBiyS-00082v-9q for bug-gnu-emacs@gnu.org; Mon, 15 Feb 2021 13:51:56 -0500 Original-Received: from forward103o.mail.yandex.net ([2a02:6b8:0:1a2d::606]:36056) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBiyM-0007YE-0i for bug-gnu-emacs@gnu.org; Mon, 15 Feb 2021 13:51:56 -0500 Original-Received: from myt6-d2347e35b502.qloud-c.yandex.net (myt6-d2347e35b502.qloud-c.yandex.net [IPv6:2a02:6b8:c12:5fa8:0:640:d234:7e35]) by forward103o.mail.yandex.net (Yandex) with ESMTP id A41475F8047E for ; Mon, 15 Feb 2021 21:51:42 +0300 (MSK) Original-Received: from myt5-ca5ec8faf378.qloud-c.yandex.net (myt5-ca5ec8faf378.qloud-c.yandex.net [2a02:6b8:c12:2514:0:640:ca5e:c8fa]) by myt6-d2347e35b502.qloud-c.yandex.net (mxback/Yandex) with ESMTP id 461bo8rNrf-pgH0v3DP; Mon, 15 Feb 2021 21:51:42 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1613415102; bh=7H6qW7/VsnusKy/abg7Z/knDVuPnNjgw6ripQgWnOWA=; h=To:From:Subject:Message-ID:Date; b=M5JQcNK3kZYg8MwgWPkRc/fhhuNWo0f1LQT8REtr4WqZBT+v1EaUJIBcqvH/Ms0V2 ajimcHVzSWfyQOXJP1Jl5q5+6WdBlBm5RFg77OSuECaLV7BIb0Bxto8IEXzLBY5Y3l rVCyL/YeBZ9Rnk+8STh5P3CL5dgTsuidUGOR5o/M= Authentication-Results: myt6-d2347e35b502.qloud-c.yandex.net; dkim=pass header.i=@yandex.ru Original-Received: by myt5-ca5ec8faf378.qloud-c.yandex.net (smtp/Yandex) with ESMTPSA id 8ZMnEIzMrv-pgJGAaHx; Mon, 15 Feb 2021 21:51:42 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) Received-SPF: pass client-ip=2a02:6b8:0:1a2d::606; envelope-from=hi-angel@yandex.ru; helo=forward103o.mail.yandex.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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:200077 Archived-At: --=-SFFqjDc149lkWpt3bYqg Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Currently, if the buffer has conflict markers above the (point) and it's the last conflicted file, we bail out. A user pointed out¹ that it is a good idea to try to find conflicts in the current file as well. Indeed, it seems like more correct behaviour: going to the next conflict is whole purpose of the function, and current file might still have them. Attached patch implements additional check for conflicts just for the case when the buffer is the last conflicted file and all conflicts are above current point. 1: https://emacs.stackexchange.com/questions/63413/finding-git-conflict-in-the-same-buffer-if-cursor-is-at-end-of-the-buffer --=-SFFqjDc149lkWpt3bYqg Content-Disposition: attachment; filename="0001-vc-make-smerge-vc-next-conflict-wrap-around.patch" Content-Type: text/x-patch; name="0001-vc-make-smerge-vc-next-conflict-wrap-around.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSBmOGQ4ZjFjYmRiOTRmNzU3NjUxNjVhY2FjZDA4OWYxZTNjYzRhNzYzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLb25zdGFudGluIEtoYXJsYW1vdiA8SGktQW5nZWxAeWFuZGV4 LnJ1PgpEYXRlOiBNb24sIDE1IEZlYiAyMDIxIDIxOjM3OjMzICswMzAwClN1YmplY3Q6IFtQQVRD SF0gdmM6IG1ha2Ugc21lcmdlLXZjLW5leHQtY29uZmxpY3Qgd3JhcCBhcm91bmQKCmxpc3AvdmMv c21lcmdlLW1vZGUuZWw6CihzbWVyZ2UtbmV4dC1zYWZlKTogYSB3cmFwcGVyIGFyb3VuZCBzbWVy Z2UtbmV4dCB0aGF0IGRvZXNuJ3QgdGhyb3cKYW4gZXJyb3IuCihzbWVyZ2UtdmMtbmV4dC1jb25m bGljdCk6IG1ha2UgaXQgd3JhcCBhcm91bmQgYSBmaWxlIGlmIGl0J3MgdGhlIGxhc3QKY29uZmxp Y3RlZCBmaWxlLCBhbmQgaXQgc3RpbGwgaGFzIGNvbmZsaWN0cwotLS0KIGxpc3AvdmMvc21lcmdl LW1vZGUuZWwgfCAyMCArKysrKysrKysrKysrKy0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE0IGlu c2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC92Yy9zbWVyZ2Ut bW9kZS5lbCBiL2xpc3AvdmMvc21lcmdlLW1vZGUuZWwKaW5kZXggM2IwOWRmZTVkMi4uMDU1ODI0 MDEyMCAxMDA2NDQKLS0tIGEvbGlzcC92Yy9zbWVyZ2UtbW9kZS5lbAorKysgYi9saXNwL3ZjL3Nt ZXJnZS1tb2RlLmVsCkBAIC0xNDQ2LDYgKzE0NDYsMTQgQEAgc21lcmdlLWNoYW5nZS1idWZmZXIt Y29uZmlybQogICAiSWYgbm9uLW5pbCwgcmVxdWVzdCBjb25maXJtYXRpb24gYmVmb3JlIG1vdmlu ZyB0byBhbm90aGVyIGJ1ZmZlci4iCiAgIDp0eXBlICdib29sZWFuKQogCisoZGVmdW4gc21lcmdl LW5leHQtc2FmZSAoKQorICAgICJUcmllcyB0byBtb3ZlIHRvIG5leHQgY29uZmxpY3QsIHJldHVy bnMgdCBvbiBzdWNjZXNzLCBuaWwKK290aGVyd2lzZSIKKyAgKGNvbmRpdGlvbi1jYXNlIGVycgor ICAgICAgKG5vdCAoc21lcmdlLW5leHQpKQorICAgICgnZXJyb3IKKyAgICAgbmlsKSkpCisKIChk ZWZ1biBzbWVyZ2UtdmMtbmV4dC1jb25mbGljdCAoKQogICAiR28gdG8gbmV4dCBjb25mbGljdCwg cG9zc2libHkgaW4gYW5vdGhlciBmaWxlLgogRmlyc3QgdHJpZXMgdG8gZ28gdG8gdGhlIG5leHQg Y29uZmxpY3QgaW4gdGhlIGN1cnJlbnQgYnVmZmVyLCBhbmQgaWYgbm90CkBAIC0xNDY5LDEyICsx NDc3LDEyIEBAIHNtZXJnZS12Yy1uZXh0LWNvbmZsaWN0CiAgICAgICAgICAoaWYgKGFuZCAoYnVm ZmVyLW1vZGlmaWVkLXApIGJ1ZmZlci1maWxlLW5hbWUpCiAgICAgICAgICAgICAgKHNhdmUtYnVm ZmVyKSkKICAgICAgICAgICh2Yy1maW5kLWNvbmZsaWN0ZWQtZmlsZSkKLSAgICAgICAgIChpZiAo ZXEgYnVmZmVyIChjdXJyZW50LWJ1ZmZlcikpCi0gICAgICAgICAgICAgOzsgRG8gbm90aGluZzog cHJlc3VtYWJseSBgdmMtZmluZC1jb25mbGljdGVkLWZpbGUnIGFscmVhZHkKLSAgICAgICAgICAg ICA7OyBlbWl0dGVkIGEgbWVzc2FnZSBleHBsYWluaW5nIHRoZXJlIGFyZW4ndCBhbnkgbW9yZSBj b25mbGljdHMuCi0gICAgICAgICAgICAgbmlsCi0gICAgICAgICAgIChnb3RvLWNoYXIgKHBvaW50 LW1pbikpCi0gICAgICAgICAgIChzbWVyZ2UtbmV4dCkpKSkpKSkKKyAgICAgICAgICh3aGVuIChl cSBidWZmZXIgKGN1cnJlbnQtYnVmZmVyKSkKKyAgICAgICAgICAgOzsgdHJ5IHRvIGZpbmQgYSBj b25mbGljdCBtYXJrZXIgaW4gY3VycmVudCBmaWxlIGFib3ZlIHRoZSBwb2ludAorICAgICAgICAg ICAobGV0ICgocHJldi1wb3MgKHBvaW50KSkpCisgICAgICAgICAgICAgKGdvdG8tY2hhciAocG9p bnQtbWluKSkKKyAgICAgICAgICAgICAod2hlbiAobm90IChzbWVyZ2UtbmV4dC1zYWZlKSkKKyAg ICAgICAgICAgICAgIChnb3RvLWNoYXIgcHJldi1wb3MpKSkpKSkpKSkKIAogKHByb3ZpZGUgJ3Nt ZXJnZS1tb2RlKQogCi0tIAoyLjMwLjEKCg== --=-SFFqjDc149lkWpt3bYqg--