From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#73544: smerge key bindings awkward Date: Mon, 30 Sep 2024 08:39:11 -0400 Message-ID: References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> <86zfnr3tu9.fsf@gnu.org> Reply-To: Stefan Monnier Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="6262"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 73544@debbugs.gnu.org, Dmitry Gutov , Daniel Colascione To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Sep 30 14:39:54 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1svFgv-0001Ny-Lt for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 30 Sep 2024 14:39:54 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1svFge-00071s-1l; Mon, 30 Sep 2024 08:39:36 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1svFgc-0006w2-B0 for bug-gnu-emacs@gnu.org; Mon, 30 Sep 2024 08:39:34 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1svFgc-00050t-1E for bug-gnu-emacs@gnu.org; Mon, 30 Sep 2024 08:39:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=8t/9L/ZEe7063KCUo4YV06F/HoushKFz7Ysl5N3G4ZU=; b=uBzZ+EgysuFZXjJHugxUGmdCOPBDkGyFmuvax9jrb7kpU6fErNxlOKTWcwzqSLqpNDbFzjrqtm0c7JAHbZ3AWFJ3gqqopnOtwOqCrUJtbd6pdJdmbMHguCBa8XYov/XIilrBN60f4X/SBGxOnoTfdLUJlgBCRsCs9vcpt3f19x0vd1f5yOGtUWMOiqZfFpTKRDom8jQa+Y95sRfXmlD6eZlaosX2Qc80r1qOm4RPPvRrC4NGPStaFitsmPav1PSKU5b5j4KyObfrQ7MWeJHeYNdxYEdR6Gwj54FM4LYEYK8Taa2kn0nDzRn1xz43EhpDq+OGy1uWb6JmBiPTPFgKxA==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1svFh8-0001Gd-HZ for bug-gnu-emacs@gnu.org; Mon, 30 Sep 2024 08:40:06 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 30 Sep 2024 12:40:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73544 X-GNU-PR-Package: emacs Original-Received: via spool by 73544-submit@debbugs.gnu.org id=B73544.17276999974771 (code B ref 73544); Mon, 30 Sep 2024 12:40:06 +0000 Original-Received: (at 73544) by debbugs.gnu.org; 30 Sep 2024 12:39:57 +0000 Original-Received: from localhost ([127.0.0.1]:44973 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1svFgx-0001Ek-Ou for submit@debbugs.gnu.org; Mon, 30 Sep 2024 08:39:56 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:59031) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1svFgu-0001DD-Rk for 73544@debbugs.gnu.org; Mon, 30 Sep 2024 08:39:53 -0400 Original-Received: from pmg1.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id C1E3B100044; Mon, 30 Sep 2024 08:39:14 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1727699953; bh=Epxu9DdYKF/uyt3pPhcp/jczUp2yT+1yTcDl2He/OZg=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=V0ShOBYPhuG5zOzYRxoiM+2F+J3D6ge69SXprhvlKUNpbs5ibkwMOWIcvnM2dFP0x UH2j9/mOJA5nDpyAFJBHyECSshewfuVjJ4MmYqRUSWWkcDNcz0aouLjf4dIJadlC9f ofW5YzH4aa+GtO6TE5OetJqBFLokZM8kGa5G7ib/uSPuAFo8tMn+QeFVMM/kXEvNbz tqbaHWgcn7RcWkyVDX+VDgsEjEVp9sx4grryBeWDcfIrqNpKBWxMErX56CaODb4mtT vtaInySU5Ofp5psu2aP6tebwESkUl5GIdnjNARKqK23qbAtyUbMvcdyznlNf/IESNM H4LxFlp225TeQ== Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id 86927100035; Mon, 30 Sep 2024 08:39:13 -0400 (EDT) Original-Received: from pastel (unknown [216.154.14.167]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 542EE12082A; Mon, 30 Sep 2024 08:39:13 -0400 (EDT) In-Reply-To: <86zfnr3tu9.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 29 Sep 2024 08:35:42 +0300") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:292711 Archived-At: >> In smerge mode, C-c ^ n goes to the next merge conflict. Having resolved >> all merge conflicts, smerge turns >> itself off. Typing C-c ^ n again now puts a stray "n" into the buffer. >> Is there some tweak we can make to avoid >> this situation? Change the default of smerge-auto-leave? FWIW, I use (setq smerge-command-prefix "\e") so for me the binding is `M-n` which doesn't suffer from this problem. Note: This setting has other downsides, of course, and can't be used as a default. Stefan