From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: [PATCH] =?utf-8?Q?Don=E2=80=99t?= run smerge multiple times Date: Thu, 13 Feb 2020 11:17:32 -0500 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="15877"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: emacs-devel@gnu.org To: Matthew Bauer Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Feb 13 17:18:25 2020 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1j2HC4-000428-QE for ged-emacs-devel@m.gmane-mx.org; Thu, 13 Feb 2020 17:18:24 +0100 Original-Received: from localhost ([::1]:55274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2HC3-0000TR-TF for ged-emacs-devel@m.gmane-mx.org; Thu, 13 Feb 2020 11:18:23 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:51957) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2HBL-0008Oz-3x for emacs-devel@gnu.org; Thu, 13 Feb 2020 11:17:40 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2HBJ-00033c-7y for emacs-devel@gnu.org; Thu, 13 Feb 2020 11:17:38 -0500 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:18022) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j2HBJ-00032d-3b for emacs-devel@gnu.org; Thu, 13 Feb 2020 11:17:37 -0500 Original-Received: from pmg3.iro.umontreal.ca (localhost [127.0.0.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 3397B44E6EA; Thu, 13 Feb 2020 11:17:36 -0500 (EST) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 7559944E6E3; Thu, 13 Feb 2020 11:17:34 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1581610654; bh=ujDeonZ/xzrUMR+mGyU3hsjShTuA8rtwGzWGFmbQHGc=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=nTotskBg0+1vjUIvxGpnLK7n9Ebt5SaW7/+Kd/nag2fYct53bKUosoKrXn+IH4HMi aj53iVhXU8ii1/o704oXVSHQHNTugXKJMuDdtrIB556WCWAcLDurOUrQ5GrkjoklmH Qxtck8rMGMudGwgxp8URMrhUrS90G8jEb7K5sJXmhoaNU+Dg4iW0HWTpIbQWsCcwdP S7MR8DwgbXPOPRyh6MdvfzNRfC+w4Gd34iKkHprbowO2ADkQMCEEN1ROFOHoxqmKzh ZQvPAaEk2nYV+s3C2GEvV1GLVd3km6TUcoon6mgpVmyP82NhQ3b3qtywqXBHn+9hiF 62a0nrtPyHNdA== Original-Received: from alfajor (modemcable157.163-203-24.mc.videotron.ca [24.203.163.157]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id DA4191203D6; Thu, 13 Feb 2020 11:17:33 -0500 (EST) In-Reply-To: (Matthew Bauer's message of "Tue, 11 Feb 2020 13:55:48 -0500") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 132.204.25.50 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:244918 Archived-At: Hi Matthew, > autorevert ends up calling vc-git-find-file-hook multiple times. This sounds like a problem in itself. Or is it really because the file gets modified multiple times? > When this happens, smerge restarts and goes to the next hunk. This is > not desired when in the middle of an edit. Indeed. > To fix, don=E2=80=99t start smerge when smerge is already enabled. That sounds good. Tho now that I think about it, going to the next hunk sounds like a bad idea when in the middle of an edit reagrdless of you were already in smerge-mode. > Related to > https://lists.gnu.org/archive/html/emacs-devel/2015-10/msg02201.html That patch was never installed. Has that problem been fixed/circumvented some other way? Stefan