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 18:28:33 -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> <1550527312.8160.1@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="134220"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: 34420-done@debbugs.gnu.org To: hi-angel@yandex.ru Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Feb 19 00:29:19 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 1gvsLe-000Ymb-Cu for geb-bug-gnu-emacs@m.gmane.org; Tue, 19 Feb 2019 00:29:18 +0100 Original-Received: from localhost ([127.0.0.1]:38180 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvsLd-0005Qn-Bi for geb-bug-gnu-emacs@m.gmane.org; Mon, 18 Feb 2019 18:29:17 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:44409) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvsLP-0005Ou-DX for bug-gnu-emacs@gnu.org; Mon, 18 Feb 2019 18:29:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gvsLO-0000i3-Lx for bug-gnu-emacs@gnu.org; Mon, 18 Feb 2019 18:29:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:54143) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gvsLO-0000he-EL for bug-gnu-emacs@gnu.org; Mon, 18 Feb 2019 18:29:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gvsLO-0004es-65 for bug-gnu-emacs@gnu.org; Mon, 18 Feb 2019 18:29:02 -0500 Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Mon, 18 Feb 2019 23:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 34420 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Mail-Followup-To: 34420@debbugs.gnu.org, monnier@IRO.UMontreal.CA, Hi-Angel@yandex.ru Original-Received: via spool by 34420-done@debbugs.gnu.org id=D34420.155053252017848 (code D ref 34420); Mon, 18 Feb 2019 23:29:01 +0000 Original-Received: (at 34420-done) by debbugs.gnu.org; 18 Feb 2019 23:28:40 +0000 Original-Received: from localhost ([127.0.0.1]:53424 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gvsL2-0004dm-0V for submit@debbugs.gnu.org; Mon, 18 Feb 2019 18:28:40 -0500 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:43315) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gvsKz-0004dY-4z for 34420-done@debbugs.gnu.org; Mon, 18 Feb 2019 18:28:38 -0500 Original-Received: from ceviche.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.7/8.14.1) with ESMTP id x1INSYZw009324; Mon, 18 Feb 2019 18:28:34 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id B79F0661E8; Mon, 18 Feb 2019 18:28:33 -0500 (EST) In-Reply-To: <1550527312.8160.1@yandex.ru> (hi-angel@yandex.ru's message of "Tue, 19 Feb 2019 01:01:52 +0300") X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0.1 X-NAI-Spam-Rules: 3 Rules triggered GEN_SPAM_FEATRE=0.1, EDT_SA_DN_PASS=0, RV6485=0 X-NAI-Spam-Version: 2.3.0.9418 : core <6485> : inlines <7018> : streams <1813436> : uri <2798498> 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:155526 Archived-At: > Ah, works for me, thanks! I didn't want to upgrade to latest master becau= se > I've been using harfbuzz branch, but I just installed and tested master = =E2=80=94 > everything is okay. Thanks, closing, Stefan