From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Hi-Angel Newsgroups: gmane.emacs.help Subject: Re: How to navigate to next git conflict? Date: Wed, 6 Feb 2019 17:47:44 +0300 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="104828"; mail-complaints-to="usenet@blaine.gmane.org" Cc: help-gnu-emacs@gnu.org To: Stefan Monnier Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Wed Feb 06 15:48:57 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 1grOVT-000R6f-Dv for geh-help-gnu-emacs@m.gmane.org; Wed, 06 Feb 2019 15:48:55 +0100 Original-Received: from localhost ([127.0.0.1]:52054 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grOVS-0001hq-9o for geh-help-gnu-emacs@m.gmane.org; Wed, 06 Feb 2019 09:48:54 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:47478) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grOUX-0001gF-FL for help-gnu-emacs@gnu.org; Wed, 06 Feb 2019 09:48:01 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grOUW-0001rE-Qe for help-gnu-emacs@gnu.org; Wed, 06 Feb 2019 09:47:57 -0500 Original-Received: from mail-it1-x12d.google.com ([2607:f8b0:4864:20::12d]:38523) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grOUW-0001nI-JZ for help-gnu-emacs@gnu.org; Wed, 06 Feb 2019 09:47:56 -0500 Original-Received: by mail-it1-x12d.google.com with SMTP id z20so6899097itc.3 for ; Wed, 06 Feb 2019 06:47:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=S7JXjuQl3CPNHvEHN5s4ukgf23F68M+spXxTIY/saMs=; b=q2mx8mOxhYUYAxgpDimTLWPX/+CWYteGo3I6JgKRbv/9GRvKH9e9cd2BUw8kzmLHDb 1DKNZXajfNRasn5cE7IJaRbvAe7xWdQYHzBlSfW00qwf3dXtxHfuxb+WMzETy/KNiyIK /2A9Cm6rQ4DGxrKALCHY0BFc/o6Xl6k93f2riXLaOvgG9Uhj82QApjHSKyjvR7NeddgT 8h0Jd58WCAoB2roOVYbjLEGVcZqQ436r0lb7GmRvuLDBv2Yaxys66neYCoDulGbdFusK 3nPnvQCGeP/R76IJ9ST25NNi0bOxuGBTZqWuHjqmVr3GvWYUNvArZHu8lVD4ZCX/O6hI mj9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=S7JXjuQl3CPNHvEHN5s4ukgf23F68M+spXxTIY/saMs=; b=Ij33WIJ9CvG53VPCGRMEn5PDb93AjPi5e/6qIjh0hg0DvvJW1KLtWX9xA3gcl9JRRI elF/A9wqT4XnlWAA2WzH/1TXKNzHDAJDvO2TWNDE6AM4ffvtLhtw4iePPa25/HpqjW2B eX99nPgK3Z4Xj4jwwHDEXoZkKRbZATGnm5HEMWFABS2Ib8hZC2X2aElMqqr3vpoaV5ET 75rQa1TadUhi7S4DrqgGobKDYreqN/ydtrSmIoyn74WE56aoTUSkJCsp0UvReISoAz32 gNnjPtWUZx0rje/p8C+xo5ab/ulKLjVWAxn9skAUtPwMgEoUNwtvqfrCDNolb41G+T/f nDsQ== X-Gm-Message-State: AHQUAubQG+M0e0aSJwNwU6Mx+fkW3QyubP/4BcOkcj7SmpylBbZ+qers Hh8LM6G1MkXhESR007RU/ONdZLnoCbudGP1+kYY= X-Google-Smtp-Source: AHgI3IYg1Lr8qmnAgDkxCoBdPwrhnbNkXTQAfcYxLAHovYgxC4CXVMGl1Ykh0mlc+FvcWhqKZwD19rpJ37WxKnPo9xE= X-Received: by 2002:a5d:8906:: with SMTP id b6mr5077863ion.13.1549464475465; Wed, 06 Feb 2019 06:47:55 -0800 (PST) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::12d 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:119219 Archived-At: On Wed, 6 Feb 2019 at 17:11, Stefan Monnier wrote: > > > (condition-case err > > (not (smerge-next)) > > ('error > > This catches both the `error` and the `quote` conditions. > > > Stefan What is "quote condition"? FWIW, it's very hard to find how to catch some "error". I managed to find this way of doing that in someone's blog post.