From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: hi-angel@yandex.ru Newsgroups: gmane.emacs.bugs Subject: bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict Date: Tue, 19 Feb 2019 01:01:52 +0300 Message-ID: <1550527312.8160.1@yandex.ru> 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=windows-1251; format=flowed Content-Transfer-Encoding: quoted-printable Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="104185"; mail-complaints-to="usenet@blaine.gmane.org" Cc: 34420@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Feb 18 23:20:41 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 1gvrHE-000R0G-TH for geb-bug-gnu-emacs@m.gmane.org; Mon, 18 Feb 2019 23:20:41 +0100 Original-Received: from localhost ([127.0.0.1]:37492 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvrHD-0001hm-Nv for geb-bug-gnu-emacs@m.gmane.org; Mon, 18 Feb 2019 17:20:39 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:58660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvrAq-0005cL-7D for bug-gnu-emacs@gnu.org; Mon, 18 Feb 2019 17:14:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gvr0A-000719-WE for bug-gnu-emacs@gnu.org; Mon, 18 Feb 2019 17:03:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:54046) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gvr0A-000715-RV for bug-gnu-emacs@gnu.org; Mon, 18 Feb 2019 17:03:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gvr09-00013u-S5 for bug-gnu-emacs@gnu.org; Mon, 18 Feb 2019 17:03:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: hi-angel@yandex.ru Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 18 Feb 2019 22:03: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.15505273273950 (code B ref 34420); Mon, 18 Feb 2019 22:03:01 +0000 Original-Received: (at 34420) by debbugs.gnu.org; 18 Feb 2019 22:02:07 +0000 Original-Received: from localhost ([127.0.0.1]:53325 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gvqzG-00011d-Jr for submit@debbugs.gnu.org; Mon, 18 Feb 2019 17:02:06 -0500 Original-Received: from forward103j.mail.yandex.net ([5.45.198.246]:57121) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gvqzB-00010s-86 for 34420@debbugs.gnu.org; Mon, 18 Feb 2019 17:02:02 -0500 Original-Received: from mxback10g.mail.yandex.net (mxback10g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:171]) by forward103j.mail.yandex.net (Yandex) with ESMTP id E2F7D67417A4; Tue, 19 Feb 2019 01:01:54 +0300 (MSK) Original-Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback10g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id BoPHdzg5wr-1sMudOEj; Tue, 19 Feb 2019 01:01:54 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1550527314; bh=1BFlQJD/DRz0i45O51iAbY8NC6Lhw9EKpuPCdbg9z9U=; h=Date:From:Subject:To:Cc:Message-Id:In-Reply-To:References; b=EXETcUbt7KZY4lzF6/xS17LAfGx+ha+lTsvKxMriMBuOk4Lqza853T4Q57lz9C7iB QjIg9JEOXjQRrzRnkjnb8xdJlu3CHmnAxVubvEYid7rQPKqRZjXO+h4i9MrbWFE3Ej d2W5wADYL9rf9g+z2LFZ+79b/RC7AMHfdAMkiVH8= Authentication-Results: mxback10g.mail.yandex.net; dkim=pass header.i=@yandex.ru Original-Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id KprGFV2mW1-1rPKXcM4; Tue, 19 Feb 2019 01:01:53 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client certificate not present) In-Reply-To: X-Mailer: geary/master~g53b905dc 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:155523 Archived-At: =C2 =C2=F2, 19 =F4=E5=E2. 2019 =E2 12:51 =C4=CF (AM), Stefan Monnier=20 =ED=E0=EF=E8=F1=E0=EB: >> 1. On the first call of the function I get "smerge-vc-next-conflict: >> Symbol=92s function definition is void: vc-find-conflicted-file".=20 >> This starts >> working once I execute (require 'vc) >=20 > Did you take only smerge-mode.el ? >=20 > 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. >=20 >> 2. Although I didn't set smerge-change-buffer-confirm to nil,=20 >> there's no >> confirmation before going to another buffer. >=20 > I assume it's because you run it via `M-x`. > The confirmation only kicks in if you run it via a keybinding. >=20 >=20 > Stefan Ah, works for me, thanks! I didn't want to upgrade to latest master=20 because I've been using harfbuzz branch, but I just installed and=20 tested master =97 everything is okay. =