From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Daniel Colascione Newsgroups: gmane.emacs.bugs Subject: bug#73544: smerge key bindings awkward Date: Sun, 29 Sep 2024 21:41:56 -0700 Message-ID: <16EEA02F-E09C-4556-88F1-BA575239F354@dancol.org> References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="9452"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: K-9 Mail for Android To: Dmitry Gutov , 73544@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Sep 30 06:44:52 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 1sv8HD-0002Jv-Gl for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 30 Sep 2024 06:44:52 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sv8H2-0001at-Gu; Mon, 30 Sep 2024 00:44:40 -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 1sv8H0-0001aQ-CM for bug-gnu-emacs@gnu.org; Mon, 30 Sep 2024 00:44:38 -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 1sv8H0-0004qM-39 for bug-gnu-emacs@gnu.org; Mon, 30 Sep 2024 00:44:38 -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:References:In-Reply-To:From:Date:To:Subject; bh=oysG0sYOa4Mvb9L17JNpWyeZDbRrhULhDSRGWu6TWsk=; b=di8S93ZIr3o3GF+VaE+iE/TpbSmRl3AW5aTJZ6gKBq/NDrW2hvaitkxXLiTljm3v9ZwQIlJUkwZXu5jKEnjWM0x/zkHmaxyJkpIOPDXS9mVHsjzP/oU7sO8vsx5ZYcZd0Nn9mUv/0v3mpSbzoqOT8ZBXVTLVDd1JF7zHDQYoFUae6V3oB7Ln3Th3ykaAxRkVWD+9R/ZnISEyq5TNEfMXkAqQJIRuTrihZGDEvoQYWV49nhO92NXCqUtNeHDhvVn2SQdMeQdCqwKjMkNQxt9latlPCd2oKGArDEgSm+3EviORnu/Q3UIPM1WI9SRzabLN8hACl3Iso0UqWMLxVJpjAA==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sv8HV-0008VE-Pi for bug-gnu-emacs@gnu.org; Mon, 30 Sep 2024 00:45:09 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Daniel Colascione Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 30 Sep 2024 04:45:09 +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.172767150132582 (code B ref 73544); Mon, 30 Sep 2024 04:45:09 +0000 Original-Received: (at 73544) by debbugs.gnu.org; 30 Sep 2024 04:45:01 +0000 Original-Received: from localhost ([127.0.0.1]:44293 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sv8HF-0008Rw-FV for submit@debbugs.gnu.org; Mon, 30 Sep 2024 00:44:59 -0400 Original-Received: from dancol.org ([96.126.100.184]:33756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sv8H6-0008Pw-Mm for 73544@debbugs.gnu.org; Mon, 30 Sep 2024 00:44:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=dancol.org; s=x; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID: References:In-Reply-To:Subject:To:From:Date:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=oysG0sYOa4Mvb9L17JNpWyeZDbRrhULhDSRGWu6TWsk=; b=bY0rxUInApl2Uz2g+pGYkFeJjz ZJod4qsWydnh/CGB3MjC40K9awV+A85AYR0OMsCB00q6BaDguRgqcFUw6MQvmDMaC8mgZPZlhGHqS quX2B04KNrOHNh3iYuVVm69jhSwvAc+WuAEFnemrDeW00ZIY4BY7/Xz1pGQCS7VfY43fFM8P7QV2t L26X7otKe9GaIEqhpMncduqRrjNwjP+cyu1eBx8+IDDrhOozM2wH2CHmgE0mZgt9+X4NWaUuIiFGq qMcMiPodcBNH8NyHOCnHbeWEYm1odUspgFO2zOBvmwIR6G1VR6+vOWdBbnEBD2V7m+Ky5FaUI9hji viS5eTaw==; Original-Received: from [2600:1010:b061:4534:0:a:6f9d:3901] (port=33052 helo=[IPv6:::1]) by dancol.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.96) (envelope-from ) id 1sv8EO-0001J2-14; Mon, 30 Sep 2024 00:41:57 -0400 In-Reply-To: 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:292691 Archived-At: On September 29, 2024 5:33:02 PM PDT, Dmitry Gutov wr= ote: >On 29/09/2024 06:30, Daniel Colascione wrote: >> In smerge mode, C-c ^ n goes to the next merge conflict=2E Having resol= ved all merge conflicts, smerge turns itself off=2E Typing C-c ^ n again no= w puts a stray "n" into the buffer=2E Is there some tweak we can make to av= oid this situation? Change the default of smerge-auto-leave? > >Would it be better if 'C-c ^ n' jumped across files? > >I=2Ee=2E effectively called smerge-vc-next-conflict=2E > >Not sure if it would always jump to the next file when reaching the end o= f the current one, or only when all hunks are resolved=2E > >Anyway, that approach would require making the bindings global, I think= =2E The prev/next ones, at least=2E Sure=2E If I had my druthers, we'd just enable the C-c ^ keymap globally e= verywhere all the time and be done with it=2E That would work whether or no= t we bound C-c ^ n to smerge-vc-next-conflict or left it as is=2E The way i= t is now, we optimize for a false economy of keymap minimalism (putting the= smerge keymaps on a minor mode) and minor mode minimalism (disabling smerg= e mode ASAP gaining essentially nothing and in this vacuous exchange gettin= g the problem I highlighted in the bug report and others=2E