From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict Date: Sun, 17 Feb 2019 17:37:56 +0200 Message-ID: <83k1hyl92j.fsf@gnu.org> 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; charset=utf-8 Content-Transfer-Encoding: 8bit Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="65232"; mail-complaints-to="usenet@blaine.gmane.org" Cc: monnier@IRO.UMontreal.CA, 34420@debbugs.gnu.org To: Konstantin Kharlamov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Feb 17 16:39:12 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 1gvOXA-000Gqq-8L for geb-bug-gnu-emacs@m.gmane.org; Sun, 17 Feb 2019 16:39:12 +0100 Original-Received: from localhost ([127.0.0.1]:43017 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvOX9-0006Ny-Ac for geb-bug-gnu-emacs@m.gmane.org; Sun, 17 Feb 2019 10:39:11 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:60142) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvOX1-0006NY-6R for bug-gnu-emacs@gnu.org; Sun, 17 Feb 2019 10:39:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gvOX0-0001Kp-By for bug-gnu-emacs@gnu.org; Sun, 17 Feb 2019 10:39:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:52206) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gvOX0-0001Kk-7p for bug-gnu-emacs@gnu.org; Sun, 17 Feb 2019 10:39:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gvOX0-0005RX-4C for bug-gnu-emacs@gnu.org; Sun, 17 Feb 2019 10:39:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 17 Feb 2019 15:39:02 +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.155041788520856 (code B ref 34420); Sun, 17 Feb 2019 15:39:02 +0000 Original-Received: (at 34420) by debbugs.gnu.org; 17 Feb 2019 15:38:05 +0000 Original-Received: from localhost ([127.0.0.1]:51487 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gvOW5-0005QJ-6n for submit@debbugs.gnu.org; Sun, 17 Feb 2019 10:38:05 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:45548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gvOW3-0005Pj-8z for 34420@debbugs.gnu.org; Sun, 17 Feb 2019 10:38:04 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:56036) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvOVt-00013J-TI; Sun, 17 Feb 2019 10:37:55 -0500 Original-Received: from [176.228.60.248] (port=3201 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1gvOVs-0004dT-PP; Sun, 17 Feb 2019 10:37:53 -0500 In-reply-to: <4f8f43b4-a64c-6c90-52e2-3b20bc4e214f@yandex.ru> (message from Konstantin Kharlamov on Sun, 17 Feb 2019 12:18:53 +0300) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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:155470 Archived-At: > Cc: 34420@debbugs.gnu.org > From: Konstantin Kharlamov > Date: Sun, 17 Feb 2019 12:18:53 +0300 > > > 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". The command name being explicit (at > least should be — I'm not a native English speaker, please tell me if > it's not) about going to the next conflict in the repository, and > conflicts are markers in different files. I'm not sure this is always the case. I can certainly envision a user who might be surprised by being switched to another buffer. Asking a question like "No more conflicts in this file; go to next one?" might in that case be a good idea. > Emitting a warning in this case would be annoying, because the user > expects to be taken to the next conflict if there's any. We could have an option to control this behavior.