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.help Subject: Re: How to navigate to next git conflict? Date: Wed, 06 Feb 2019 09:11:00 -0500 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="210972"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: help-gnu-emacs@gnu.org To: Hi-Angel Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Wed Feb 06 15:15:05 2019 Return-path: Envelope-to: geh-help-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 1grNyi-000sjJ-ID for geh-help-gnu-emacs@m.gmane.org; Wed, 06 Feb 2019 15:15:04 +0100 Original-Received: from localhost ([127.0.0.1]:51554 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grNyh-0005IL-Ea for geh-help-gnu-emacs@m.gmane.org; Wed, 06 Feb 2019 09:15:03 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:38571) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grNur-0002xd-Kg for help-gnu-emacs@gnu.org; Wed, 06 Feb 2019 09:11:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grNuq-0005Ce-Vg for help-gnu-emacs@gnu.org; Wed, 06 Feb 2019 09:11:05 -0500 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:37191) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grNuq-0005CU-RC for help-gnu-emacs@gnu.org; Wed, 06 Feb 2019 09:11:04 -0500 Original-Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.7/8.14.1) with ESMTP id x16EB3on008279; Wed, 6 Feb 2019 09:11:03 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 22FA66A1FE; Wed, 6 Feb 2019 09:11:00 -0500 (EST) In-Reply-To: (Hi-Angel's message of "Wed, 6 Feb 2019 14:37:06 +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, RV6477=0 X-NAI-Spam-Version: 2.3.0.9418 : core <6477> : inlines <7011> : streams <1812255> : uri <2791837> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.20 X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "help-gnu-emacs" Xref: news.gmane.org gmane.emacs.help:119218 Archived-At: > (condition-case err > (not (smerge-next)) > ('error This catches both the `error` and the `quote` conditions. Stefan