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: Sat, 16 Feb 2019 08:41:58 -0500 Message-ID: References: <20190210211453.26816-2-Hi-Angel@yandex.ru> <835ztkmbnk.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="258601"; 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, Konstantin Kharlamov To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Feb 16 14:43:14 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 1gv0FO-0015AS-96 for geb-bug-gnu-emacs@m.gmane.org; Sat, 16 Feb 2019 14:43:14 +0100 Original-Received: from localhost ([127.0.0.1]:56317 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gv0FN-00005m-6s for geb-bug-gnu-emacs@m.gmane.org; Sat, 16 Feb 2019 08:43:13 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:39552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gv0FF-00005h-Ih for bug-gnu-emacs@gnu.org; Sat, 16 Feb 2019 08:43:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gv0FE-0004Im-I3 for bug-gnu-emacs@gnu.org; Sat, 16 Feb 2019 08:43:05 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:50782) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gv0FE-0004IW-Dj for bug-gnu-emacs@gnu.org; Sat, 16 Feb 2019 08:43:04 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gv0FC-0007d3-Gu for bug-gnu-emacs@gnu.org; Sat, 16 Feb 2019 08:43:04 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 16 Feb 2019 13:43: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.155032452529249 (code B ref 34420); Sat, 16 Feb 2019 13:43:02 +0000 Original-Received: (at 34420) by debbugs.gnu.org; 16 Feb 2019 13:42:05 +0000 Original-Received: from localhost ([127.0.0.1]:50063 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gv0EG-0007bg-Ny for submit@debbugs.gnu.org; Sat, 16 Feb 2019 08:42:04 -0500 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:60387) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gv0ED-0007bG-IO for 34420@debbugs.gnu.org; Sat, 16 Feb 2019 08:42:03 -0500 Original-Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.7/8.14.1) with ESMTP id x1GDfw9G026743; Sat, 16 Feb 2019 08:41:59 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 716816A320; Sat, 16 Feb 2019 08:41:58 -0500 (EST) In-Reply-To: <835ztkmbnk.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 16 Feb 2019 09:32:15 +0200") X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0.1 X-NAI-Spam-Rules: 3 Rules triggered TRK_NCM1=0.1, EDT_SA_DN_PASS=0, RV6484=0 X-NAI-Spam-Version: 2.3.0.9418 : core <6484> : inlines <7018> : streams <1813206> : uri <2797237> 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:155456 Archived-At: >> To give some context: these patches follow this thread >> http://lists.gnu.org/archive/html/help-gnu-emacs/2019-01/msg00111.html >> (note: the thread continues the next month, i.e. February, too). > I hope Stefan (CC'ed) could comment on those. Hmm... In terms of implementation, there's nothing very deep and it looks OK (tho maybe it points to the need to autoload vc-find-conflicted-file, and obviously I'd use (point-min) rather than a hardcoded 0 and change the docstring to use the imperative rather than present tense). 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). Also, I'd save the file before switching to the next buffer. Stefan