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 00:12:06 +0300 Message-ID: <1550524327.8160.0@yandex.ru> 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=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="70819"; 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 22:13: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 1gvqDw-000IKj-Jy for geb-bug-gnu-emacs@m.gmane.org; Mon, 18 Feb 2019 22:13:12 +0100 Original-Received: from localhost ([127.0.0.1]:36748 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvqDv-0000e9-H8 for geb-bug-gnu-emacs@m.gmane.org; Mon, 18 Feb 2019 16:13:11 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:48611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvqDp-0000e3-FM for bug-gnu-emacs@gnu.org; Mon, 18 Feb 2019 16:13:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gvqDn-0001Re-SW for bug-gnu-emacs@gnu.org; Mon, 18 Feb 2019 16:13:05 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:54000) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gvqDm-0001Qd-GE for bug-gnu-emacs@gnu.org; Mon, 18 Feb 2019 16:13:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gvqDm-0007IX-97 for bug-gnu-emacs@gnu.org; Mon, 18 Feb 2019 16:13: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 21:13: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.155052433927957 (code B ref 34420); Mon, 18 Feb 2019 21:13:02 +0000 Original-Received: (at 34420) by debbugs.gnu.org; 18 Feb 2019 21:12:19 +0000 Original-Received: from localhost ([127.0.0.1]:53281 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gvqD5-0007Gr-AR for submit@debbugs.gnu.org; Mon, 18 Feb 2019 16:12:19 -0500 Original-Received: from forward101o.mail.yandex.net ([37.140.190.181]:33881) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gvqD2-0007GS-4p for 34420@debbugs.gnu.org; Mon, 18 Feb 2019 16:12:17 -0500 Original-Received: from mxback2o.mail.yandex.net (mxback2o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1c]) by forward101o.mail.yandex.net (Yandex) with ESMTP id 7197A3C014D3; Tue, 19 Feb 2019 00:12:09 +0300 (MSK) Original-Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback2o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id hD1fug4Oim-C8xmKxt1; Tue, 19 Feb 2019 00:12:09 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1550524329; bh=u8wE7dbP5DYr11bAMeHgkU58rHx+mSyXTUqAIfuEncc=; h=Date:From:Subject:To:Cc:Message-Id:In-Reply-To:References; b=X2Zt7p8VYBOBDRVBZ2l3x2zxmMeYWBRy51NelI55b21oTg4HiDXBE7eTgM1ZnlGKa o0hTMssNJzjQV5GzfNIJn/7O0y0IpzAdARo4+hPxwtEMSyrbqa6b72NDoVpylYIbgS bQJLgSVnyYsbaZfDqEXoJGGAuAdCI+I74x2J6/rI= Authentication-Results: mxback2o.mail.yandex.net; dkim=pass header.i=@yandex.ru Original-Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id daNyGuj6xA-C7PiDU2M; Tue, 19 Feb 2019 00:12:07 +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:155516 Archived-At: =C2 =CF=ED, 18 =F4=E5=E2. 2019 =E2 8:49 =CF=CF (PM), Stefan Monnier=20 =ED=E0=EF=E8=F1=E0=EB: >> I'll install your code as a first step, >=20 > Done, as well as a subsequent patch which makes it save the buffer and > request confirmation. Try it out and let me know of any > remaining problems. >=20 >=20 > Stefan Ok, thanks, so, I'm trying the latest smerge-mode.el out, and two=20 issues I see: 1. On the first call of the function I get "smerge-vc-next-conflict:=20 Symbol=92s function definition is void: vc-find-conflicted-file". This=20 starts working once I execute (require 'vc) 2. Although I didn't set smerge-change-buffer-confirm to nil, there's=20 no confirmation before going to another buffer. =