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: Sat, 28 Sep 2024 23:30:13 -0400 Message-ID: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=----LLQN5RKHWN3H308P2APOQ9IRRQOPVR Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="39374"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: K-9 Mail for Android To: 73544@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Sep 29 05:30:59 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 1suke9-000A57-Tc for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 29 Sep 2024 05:30:58 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sukdn-0002zN-7B; Sat, 28 Sep 2024 23:30:35 -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 1sukdl-0002zD-LF for bug-gnu-emacs@gnu.org; Sat, 28 Sep 2024 23:30: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 1sukdk-00041y-5z for bug-gnu-emacs@gnu.org; Sat, 28 Sep 2024 23:30: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:From:Date:To:Subject; bh=YS5rKqbkYx1c0EToUB1CRLoaavdvJh+XgPfmg5yaMkE=; b=NI7F7nwLVTMLJr/d8i5isfpUh1J3rdplGoiSNblz5ZljslqBrEBvSg3xmXfic1OvP1uBwcd5uGpbpWyYysWa5fD6tFxfx62sEHfdSXTeVHq4+t6Qqasj0YICXJCg6xZvSz82a/UmRZelJRJXU6J5C8d5Na8xiVtuaeRHhPAvnWOc9Kh9ef3qxtgg/ui3J2RDhIUNnN52NF6gw38YLFk1qGIVRD26JXzC15pA3jRS9zd66Lmtv45cNlwEaYKMx0iZTac4eNKu/hor4wmgdU1y5P1VPwVkotOCbLrcbXSsTdPiTM+dZe5Td7CK/uViXmx3KXAdUJhG6RP+EbkbbCLDnw==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sukeE-0005Vv-Kz for bug-gnu-emacs@gnu.org; Sat, 28 Sep 2024 23:31:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Daniel Colascione Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 29 Sep 2024 03:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73544 X-GNU-PR-Package: emacs X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.172758065521153 (code B ref -1); Sun, 29 Sep 2024 03:31:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 29 Sep 2024 03:30:55 +0000 Original-Received: from localhost ([127.0.0.1]:58872 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suke7-0005V6-2R for submit@debbugs.gnu.org; Sat, 28 Sep 2024 23:30:55 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:44240) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suke4-0005Uy-Pp for submit@debbugs.gnu.org; Sat, 28 Sep 2024 23:30:53 -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 1sukdW-0002yZ-Uv for bug-gnu-emacs@gnu.org; Sat, 28 Sep 2024 23:30:20 -0400 Original-Received: from dancol.org ([2600:3c01:e000:3d8::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sukdU-0003q0-RA for bug-gnu-emacs@gnu.org; Sat, 28 Sep 2024 23:30:18 -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: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:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=YS5rKqbkYx1c0EToUB1CRLoaavdvJh+XgPfmg5yaMkE=; b=Q nXZ0drIwAU3sVm/5gEXeAPm6XMRnt/3jqFPxkbUd/GaSMEJj4at+QpLBCu6ZKNEP8Yov77tt2r0P3 aTM2ht6PJB9qBlwdD30DjbY7+sBnRFbYNVeVF0PvBsTAKFuxsnSmmkcB6IXb96kDGdxsGxf700LSK 3YaGW9Q4/3aBCDAoxa2HuXHYvtT/mH28qnk3hWhgcCGTsAFUdPPnnmBVdhaguHIPxv9/sHzYhBb/y SWQK5BstKPRrQKPfAHwCWnNyFkD4WI0QsKZibCjiNctTxgUFeUTw24ItsotLE6WWprCnnu4dPUQvn ma/AA5ZZ8Gim4JoFZl46tagzNZ6gAULkw==; Original-Received: from 2603-9001-4203-1ab2-50d3-fb48-0613-0aba.inf6.spectrum.com ([2603:9001:4203:1ab2:50d3:fb48:613:aba]:60412 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 1sukdQ-00046k-0S for bug-gnu-emacs@gnu.org; Sat, 28 Sep 2024 23:30:13 -0400 Received-SPF: pass client-ip=2600:3c01:e000:3d8::1; envelope-from=dancol@dancol.org; helo=dancol.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HTML_MESSAGE=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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:292611 Archived-At: ------LLQN5RKHWN3H308P2APOQ9IRRQOPVR Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable In smerge mode, C-c ^ n goes to the next merge conflict=2E Having resolved = all merge conflicts, smerge turns itself off=2E Typing C-c ^ n again now pu= ts a stray "n" into the buffer=2E Is there some tweak we can make to avoid = this situation? Change the default of smerge-auto-leave? ------LLQN5RKHWN3H308P2APOQ9IRRQOPVR Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable
In smerge mode, C-c ^ n goes t= o the next merge conflict=2E Having resolved all merge conflicts, smerge tu= rns itself off=2E Typing C-c ^ n again now puts a stray "n" into the buffer= =2E Is there some tweak we can make to avoid this situation? Change the def= ault of smerge-auto-leave?
------LLQN5RKHWN3H308P2APOQ9IRRQOPVR--