From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Konstantin Kharlamov Newsgroups: gmane.emacs.bugs Subject: bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict Date: Thu, 14 Feb 2019 00:44:03 +0300 Message-ID: References: <20190210211453.26816-2-Hi-Angel@yandex.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="118704"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 To: 34420@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Feb 13 22:49:06 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 1gu2Ov-000UjW-Cx for geb-bug-gnu-emacs@m.gmane.org; Wed, 13 Feb 2019 22:49:05 +0100 Original-Received: from localhost ([127.0.0.1]:35482 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu2Ou-0002kG-BQ for geb-bug-gnu-emacs@m.gmane.org; Wed, 13 Feb 2019 16:49:04 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:54071) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu2Oi-0002ed-EK for bug-gnu-emacs@gnu.org; Wed, 13 Feb 2019 16:48:53 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gu2L1-0006i4-0t for bug-gnu-emacs@gnu.org; Wed, 13 Feb 2019 16:45:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:48147) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gu2L0-0006hp-Hp for bug-gnu-emacs@gnu.org; Wed, 13 Feb 2019 16:45:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gu2L0-0005HI-EF for bug-gnu-emacs@gnu.org; Wed, 13 Feb 2019 16:45:02 -0500 X-Loop: help-debbugs@gnu.org In-Reply-To: <20190210211453.26816-2-Hi-Angel@yandex.ru> Resent-From: Konstantin Kharlamov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 13 Feb 2019 21:45: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.155009426220225 (code B ref 34420); Wed, 13 Feb 2019 21:45:02 +0000 Original-Received: (at 34420) by debbugs.gnu.org; 13 Feb 2019 21:44:22 +0000 Original-Received: from localhost ([127.0.0.1]:47428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu2KL-0005G9-Vv for submit@debbugs.gnu.org; Wed, 13 Feb 2019 16:44:22 -0500 Original-Received: from forward101p.mail.yandex.net ([77.88.28.101]:59363) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu2KH-0005Fr-Ai for 34420@debbugs.gnu.org; Wed, 13 Feb 2019 16:44:20 -0500 Original-Received: from mxback2g.mail.yandex.net (mxback2g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:163]) by forward101p.mail.yandex.net (Yandex) with ESMTP id 2809532801E4 for <34420@debbugs.gnu.org>; Thu, 14 Feb 2019 00:44:09 +0300 (MSK) Original-Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback2g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id pU27lSJwGM-i9xSaYob; Thu, 14 Feb 2019 00:44:09 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1550094249; bh=4wNeBYlb89i7fFqV0HvgY5xrU5/yrUJlBOvvYEed/E4=; h=To:From:Subject:Message-ID:Date; b=cFWn0QhuI685JGVmtlA/Kdqun7qB+8sLF8wVthXXtxwlGcaZRfQdefzQ1PTDAFme1 rYAQmBkII4tGAff6IOfzCSwC6bbVG3gfnvT52wFVGmzOaFuTFgr7soT2RFQq3JgTHZ vZ34sXoDJH9HcnVay0sinsnmte9AjCkV++SD58BU= Authentication-Results: mxback2g.mail.yandex.net; dkim=pass header.i=@yandex.ru Original-Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id dtoCt6A5NQ-i8I4nm73; Thu, 14 Feb 2019 00:44:08 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client certificate not present) Content-Language: ru-RU 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:155403 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).