From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict Date: Sun, 17 Feb 2019 22:22:09 -0500 Message-ID: References: <20190210211453.26816-2-Hi-Angel@yandex.ru> <835ztkmbnk.fsf@gnu.org> <4f8f43b4-a64c-6c90-52e2-3b20bc4e214f@yandex.ru> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="134680"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: 34420@debbugs.gnu.org To: Konstantin Kharlamov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Feb 18 04:23:10 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.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1gvZWP-000Yqe-TR for geb-bug-gnu-emacs@m.gmane.org; Mon, 18 Feb 2019 04:23:10 +0100 Original-Received: from localhost ([127.0.0.1]:50100 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvZWO-0007AS-Lx for geb-bug-gnu-emacs@m.gmane.org; Sun, 17 Feb 2019 22:23:08 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:52482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvZWI-0007AL-RD for bug-gnu-emacs@gnu.org; Sun, 17 Feb 2019 22:23:03 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gvZWI-0006MB-5Z for bug-gnu-emacs@gnu.org; Sun, 17 Feb 2019 22:23:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:52651) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gvZWI-0006M7-1P for bug-gnu-emacs@gnu.org; Sun, 17 Feb 2019 22:23:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gvZWH-0001uD-Sq for bug-gnu-emacs@gnu.org; Sun, 17 Feb 2019 22:23:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 18 Feb 2019 03:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34420 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 34420-submit@debbugs.gnu.org id=B34420.15504601357253 (code B ref 34420); Mon, 18 Feb 2019 03:23:01 +0000 Original-Received: (at 34420) by debbugs.gnu.org; 18 Feb 2019 03:22:15 +0000 Original-Received: from localhost ([127.0.0.1]:51932 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gvZVX-0001sv-9x for submit@debbugs.gnu.org; Sun, 17 Feb 2019 22:22:15 -0500 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:55385) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gvZVV-0001sn-Hl for 34420@debbugs.gnu.org; Sun, 17 Feb 2019 22:22:14 -0500 Original-Received: from ceviche.home (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.7/8.14.1) with ESMTP id x1I3MAdN025908; Sun, 17 Feb 2019 22:22:11 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id 25AC166196; Sun, 17 Feb 2019 22:22:10 -0500 (EST) In-Reply-To: <4f8f43b4-a64c-6c90-52e2-3b20bc4e214f@yandex.ru> (Konstantin Kharlamov's message of "Sun, 17 Feb 2019 12:18:53 +0300") X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 2 Rules triggered EDT_SA_DN_PASS=0, RV6484=0 X-NAI-Spam-Version: 2.3.0.9418 : core <6484> : inlines <7018> : streams <1813356> : uri <2798052> 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:155486 Archived-At: >> In terms of UI it's a question of taste: I didn't provide such a command >> because I never felt the need for it (I think I like to be in control of >> changing buffer). Maybe I'd change it to first emit a warning "no more >> conflicts in this buffer" and only go to the next buffer if you repeat >> the command (as a form of confirmation that you're done with the current >> buffer). > Well, I wouldn't call changing a buffer upon explicit command from a user > a "taking control from them". I didn't mean it in the sense that the command misbehaves. Just that the command does 2 things (go to the next conflict in the same file sometimes, and go the next conflict in another file other times) and as a user I'd prefer to know which one's going to happen before it happens. As I said it's a question of taste. I think I could be tempted to use your command (in place of smerge-next) if it requested confirmation before going to the next file. I'll install your code as a first step, Stefan