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: Mon, 18 Feb 2019 16:51:05 -0500 Message-ID: References: <20190210211453.26816-2-Hi-Angel@yandex.ru> <835ztkmbnk.fsf@gnu.org> <4f8f43b4-a64c-6c90-52e2-3b20bc4e214f@yandex.ru> <1550524327.8160.0@yandex.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="245588"; 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: hi-angel@yandex.ru Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Feb 18 22:52:13 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 1gvqph-0011iw-DW for geb-bug-gnu-emacs@m.gmane.org; Mon, 18 Feb 2019 22:52:13 +0100 Original-Received: from localhost ([127.0.0.1]:37145 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvqpg-0002dA-7l for geb-bug-gnu-emacs@m.gmane.org; Mon, 18 Feb 2019 16:52:12 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:54982) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvqpX-0002bK-F4 for bug-gnu-emacs@gnu.org; Mon, 18 Feb 2019 16:52:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gvqpW-00015l-MZ for bug-gnu-emacs@gnu.org; Mon, 18 Feb 2019 16:52:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:54036) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gvqpW-00015f-IO for bug-gnu-emacs@gnu.org; Mon, 18 Feb 2019 16:52:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gvqpW-0000aK-EB for bug-gnu-emacs@gnu.org; Mon, 18 Feb 2019 16:52:02 -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 21:52: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.15505266702102 (code B ref 34420); Mon, 18 Feb 2019 21:52:02 +0000 Original-Received: (at 34420) by debbugs.gnu.org; 18 Feb 2019 21:51:10 +0000 Original-Received: from localhost ([127.0.0.1]:53317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gvqog-0000Xq-GS for submit@debbugs.gnu.org; Mon, 18 Feb 2019 16:51:10 -0500 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:60502) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gvqod-0000Xe-8O for 34420@debbugs.gnu.org; Mon, 18 Feb 2019 16:51:09 -0500 Original-Received: from milanesa.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.7/8.14.1) with ESMTP id x1ILp551026333; Mon, 18 Feb 2019 16:51:06 -0500 Original-Received: by milanesa.home (Postfix, from userid 20848) id 585A766112; Mon, 18 Feb 2019 16:51:05 -0500 (EST) In-Reply-To: <1550524327.8160.0@yandex.ru> (hi-angel@yandex.ru's message of "Tue, 19 Feb 2019 00:12:06 +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, RV6485=0 X-NAI-Spam-Version: 2.3.0.9418 : core <6485> : inlines <7018> : streams <1813429> : uri <2798455> 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:155522 Archived-At: > 1. On the first call of the function I get "smerge-vc-next-conflict: > Symbol=E2=80=99s function definition is void: vc-find-conflicted-file". T= his starts > working once I execute (require 'vc) Did you take only smerge-mode.el ? I changed vc.el so vc-find-conflicted-file is now autoloaded in the `master` branch, so you'll only see it if you use the `master` branch. > 2. Although I didn't set smerge-change-buffer-confirm to nil, there's no > confirmation before going to another buffer. I assume it's because you run it via `M-x`. The confirmation only kicks in if you run it via a keybinding. Stefan