From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Konstantin Kharlamov Newsgroups: gmane.emacs.bugs Subject: bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict Date: Sun, 17 Feb 2019 18:59:24 +0300 Message-ID: <367ad2c0-e44f-2a13-e843-33f5b1b971fa@yandex.ru> References: <20190210211453.26816-2-Hi-Angel@yandex.ru> <835ztkmbnk.fsf@gnu.org> <4f8f43b4-a64c-6c90-52e2-3b20bc4e214f@yandex.ru> <83k1hyl92j.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="170851"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 Cc: monnier@IRO.UMontreal.CA, 34420@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Feb 17 17:00:11 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 1gvOrT-000iJz-1Y for geb-bug-gnu-emacs@m.gmane.org; Sun, 17 Feb 2019 17:00:11 +0100 Original-Received: from localhost ([127.0.0.1]:43177 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvOrR-0000uf-QK for geb-bug-gnu-emacs@m.gmane.org; Sun, 17 Feb 2019 11:00:09 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:34314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvOrL-0000uJ-IK for bug-gnu-emacs@gnu.org; Sun, 17 Feb 2019 11:00:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gvOrK-0000DW-ME for bug-gnu-emacs@gnu.org; Sun, 17 Feb 2019 11:00:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:52210) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gvOrK-0000D8-HV for bug-gnu-emacs@gnu.org; Sun, 17 Feb 2019 11:00:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gvOrK-00065h-9z for bug-gnu-emacs@gnu.org; Sun, 17 Feb 2019 11:00:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Konstantin Kharlamov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 17 Feb 2019 16:00: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.155041917623346 (code B ref 34420); Sun, 17 Feb 2019 16:00:02 +0000 Original-Received: (at 34420) by debbugs.gnu.org; 17 Feb 2019 15:59:36 +0000 Original-Received: from localhost ([127.0.0.1]:51491 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gvOqu-00064T-2d for submit@debbugs.gnu.org; Sun, 17 Feb 2019 10:59:36 -0500 Original-Received: from forward103o.mail.yandex.net ([37.140.190.177]:50925) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gvOqq-000648-4T for 34420@debbugs.gnu.org; Sun, 17 Feb 2019 10:59:34 -0500 Original-Received: from mxback20o.mail.yandex.net (mxback20o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::71]) by forward103o.mail.yandex.net (Yandex) with ESMTP id D5F7F5F8046E; Sun, 17 Feb 2019 18:59:25 +0300 (MSK) Original-Received: from smtp3p.mail.yandex.net (smtp3p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:8]) by mxback20o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id RwfA0mDFyb-xPBOwYTm; Sun, 17 Feb 2019 18:59:25 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1550419165; bh=i1hlJHtKS1jLwp/Ey5xUnLy6aRKE81gI0QNpqP4kpAc=; h=Subject:To:Cc:References:From:Message-ID:Date:In-Reply-To; b=W/Lij/TGmtoz9mXOwQQhAprQ4ypsMBEPSBnJ5VuF9PwObCEeOS4PSz0G4NWqBFa1+ AqwMTYmffDDvndD9kD8aPFEVHtDl7E6VbUtEO9GhzVvXp5qIvAK5HsEVthE1RrgiMI 5/yy5TyAUAU2DYcgwl0CtsfWEkGDHYWDVetI2uZQ= Authentication-Results: mxback20o.mail.yandex.net; dkim=pass header.i=@yandex.ru Original-Received: by smtp3p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id USptt7bGOp-xObSXmTB; Sun, 17 Feb 2019 18:59:24 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client certificate not present) In-Reply-To: <83k1hyl92j.fsf@gnu.org> Content-Language: en-US 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:155471 Archived-At: On 17.02.2019 18:37, Eli Zaretskii wrote: >> 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. The thing is, we already have a function that only works within focused buffer, it is smerge-next. This patch is about adding a more "global" function, one that works within the focused repository instead of just the focused buffer. >> 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. >