From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Sean Whitton Newsgroups: gmane.emacs.bugs Subject: bug#73544: smerge key bindings awkward Date: Mon, 30 Sep 2024 07:27:09 +0800 Message-ID: <8734lif3ci.fsf@melete.silentflame.com> References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="10194"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 73544@debbugs.gnu.org To: Daniel Colascione Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Sep 30 01:27:56 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 1sv3KV-0002W3-U0 for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 30 Sep 2024 01:27:56 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sv3KC-0004j7-R4; Sun, 29 Sep 2024 19:27:37 -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 1sv3K9-0004id-Mj for bug-gnu-emacs@gnu.org; Sun, 29 Sep 2024 19:27:33 -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 1sv3K9-00025N-Bm for bug-gnu-emacs@gnu.org; Sun, 29 Sep 2024 19:27:33 -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=LjGrSoypCxM3V9CfC4YDkib7boTPAER9P3uqtZ/CFs4=; b=oWVQWkguB5RfdTtp6ZX74kAJ1LEubFJVY6LAqwCGw8Q+FnPojDMaXbZ7f+cNxP18iRzsRPIdDh/M7q69leOR91xvbrf7jG5kUQF4Ou2RLI1OVELfx6ryQkqb+VTZuV51zv9e2qLVxO0dLteb2fCcM6yiesrjlrU0pNouHUrduRiD5Wwy2z1IKUiJXecmsCd5xbmIDvVOYeh99THDKZJbkb+4w6UcM01MO2AHZbPVtF46bqkW5FrZriKcXHi9O0XMgv4kxkCyB69eG7GsfZDun4BEeYTlOMfLdnyBEk9g9JhR79vugzXumnCpHMoYL3ZBxdtiorAmsbovSL+Lyl919w==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sv3Ke-00079u-S8 for bug-gnu-emacs@gnu.org; Sun, 29 Sep 2024 19:28:04 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Sean Whitton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 29 Sep 2024 23:28:04 +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.172765248027472 (code B ref 73544); Sun, 29 Sep 2024 23:28:04 +0000 Original-Received: (at 73544) by debbugs.gnu.org; 29 Sep 2024 23:28:00 +0000 Original-Received: from localhost ([127.0.0.1]:42885 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sv3Ka-000790-5I for submit@debbugs.gnu.org; Sun, 29 Sep 2024 19:28:00 -0400 Original-Received: from sendmail.purelymail.com ([34.202.193.197]:48868) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sv3KW-00077u-LO for 73544@debbugs.gnu.org; Sun, 29 Sep 2024 19:27:58 -0400 DKIM-Signature: a=rsa-sha256; b=SbDwJi5QpcokhnclYHenKDDvS72tuy9qEVV4o7cR9x67YEX2wn3ztBGXDJgAQkd223MAPV3pg5e+VTkol0MNLAaX8Z/wscITO26HlV/zDqwzClXXBOMzrLrIIOq6gZLvHveltHGmdDhhcrEoQ1W+xLbuk4QFrkQYLllFnQCuTWAH9+nlWaoOkH9pvBbHTLuWRHzEu/O6tKWn7z1OS5rP+JkATR2zwV0aE3kC2NHfk14bcypkoCubWmjGnOBW9aiYJfo/YuhqDQG0AApL6KWQ1tMHgC3Zm57PKl3vtv8M5Mkegmr26OMGff7jW2FFftkrhHoqn9K5CxqM/V58bCW5rw==; s=purelymail1; d=spwhitton.name; v=1; bh=D0vxCWQHY+ZZ45lfhvpVcMcYaK3QrRD9cJ1myWnKylc=; h=Received:Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=rpDWFhPvF8n8dka9sr425czY6Kf5dJ0ohz/4z87a9YlgzOvFjOBUrlMgTgzm2Pcq3vw8WwALpbrWwLxUKEofgodnTZzNtVWmUdZNpXT12jTJT6aSEVayYSX9/Dn9/Rs/m+6X7vBGnhYS81WGnMD36S+Zkr+4qgj1tIrJ0o0HYrtXQXIqX+ZN6kFKaYRGpZ0zVzAO610uTDSs1kKaOCNxxUNxG0u1T38ZQMSzqwrlJP6Wu72gBDS+Hw2XFJ4dW9RLtFHGNWn+ur8o9ksz0CbgDawFD4ACtCarRfNwHZWYjkaVWroCzgga7OFwGxYWQocJd/783oaqdiPRw2QnNyNV5A==; s=purelymail1; d=purelymail.com; v=1; bh=D0vxCWQHY+ZZ45lfhvpVcMcYaK3QrRD9cJ1myWnKylc=; h=Feedback-ID:Received:Received:From:To:Subject:Date; Feedback-ID: 20115:3760:null:purelymail X-Pm-Original-To: 73544@debbugs.gnu.org Original-Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -571905802; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sun, 29 Sep 2024 23:27:12 +0000 (UTC) Original-Received: by melete.silentflame.com (Postfix, from userid 1000) id EA91B7E0BF2; Mon, 30 Sep 2024 00:27:09 +0100 (BST) In-Reply-To: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> (Daniel Colascione's message of "Sat, 28 Sep 2024 23:30:13 -0400") 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:292671 Archived-At: Hello, On Sat 28 Sep 2024 at 11:30pm -04, Daniel Colascione wrote: > 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? A related issue is that it would be nice if C-c ^ n wrapped. Else you have to both C-c ^ n and C-c ^ p to find the hunks to resolve. -- Sean Whitton