From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#73544: smerge key bindings awkward Date: Mon, 30 Sep 2024 03:33:02 +0300 Message-ID: References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="26447"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla Thunderbird To: Daniel Colascione , 73544@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Sep 30 02:33:39 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 1sv4M6-0006mO-QU for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 30 Sep 2024 02:33:39 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sv4M0-0006zR-B6; Sun, 29 Sep 2024 20:33:32 -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 1sv4Ly-0006z4-6E for bug-gnu-emacs@gnu.org; Sun, 29 Sep 2024 20:33:30 -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 1sv4Lx-0007x5-Ty for bug-gnu-emacs@gnu.org; Sun, 29 Sep 2024 20:33:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=In-Reply-To:From:References:MIME-Version:Date:To:Subject; bh=Hp5/nn/3QDR5JBTLKgHjoUDAyH2rog0iohLTOCcL6FQ=; b=tGfv7ggLt/LKLJqHob67irm0ZdmDpAfz8GKdKuIF0lVJWbsp4tBdVMcvkXKPIleVl1zJ5R1gWGwkD/QJS0xh/QnYgoPVJ4ZE6oUxwt2tFLFeoQXbuCR4L3FuJ3pnYIY3L5xfwj/bO08/c9aARoG5HfcnQxMJjdFf/Y7Xlef9lRJ5vV5PVERKC8VS9VnfBfRr7A4Rt+KRinNxJqjWyK4CfCh/rqglMpXNZ1Iq+ElbEi6JADu002urbIhnmRNfq9ROOKn5Ttepo6ZPuHsRWIhce1pAyqP7gfDePHGmHRKl4twPEb1n+iDH39WYh7h0DI0f2JfG6CkBb0FrUSmPRX5oEQ==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sv4MT-0004D7-Ri for bug-gnu-emacs@gnu.org; Sun, 29 Sep 2024 20:34:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 30 Sep 2024 00:34:01 +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.172765642716171 (code B ref 73544); Mon, 30 Sep 2024 00:34:01 +0000 Original-Received: (at 73544) by debbugs.gnu.org; 30 Sep 2024 00:33:47 +0000 Original-Received: from localhost ([127.0.0.1]:43176 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sv4ME-0004Cl-Vs for submit@debbugs.gnu.org; Sun, 29 Sep 2024 20:33:47 -0400 Original-Received: from fhigh-a3-smtp.messagingengine.com ([103.168.172.154]:49265) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sv4MB-0004Cd-HE for 73544@debbugs.gnu.org; Sun, 29 Sep 2024 20:33:44 -0400 Original-Received: from phl-compute-05.internal (phl-compute-05.phl.internal [10.202.2.45]) by mailfhigh.phl.internal (Postfix) with ESMTP id 0919F114010A; Sun, 29 Sep 2024 20:33:06 -0400 (EDT) Original-Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-05.internal (MEProxy); Sun, 29 Sep 2024 20:33:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm1; t=1727656386; x=1727742786; bh=Hp5/nn/3QDR5JBTLKgHjoUDAyH2rog0iohLTOCcL6FQ=; b= TlaHRvBIRLMSF2pT4jMFBN+CnV3z0sY//VEnQ+FSHyj+a2jKihZxZNveQrrAh+HM xxy0rc9vLBLhTMpRtfHpAzXa/O7GY7g+jk7y1W0EQ+lD+pewSvk0jvkx7hbZJ/j0 drIL5v3tmrMlOjzmwt9xm5MEaMmT5dTz9Oux2MKlw/3tQl+sM0olMQCbCMcy1+Wt eGLhOrOUGDZBBHcC7b1UiQU34gmiuUBHNJo24Ze0gEC7LMBXACdSGObl2Sgxi6Q7 ulyCkWOA3iG7Y842GZItUXibg/nB14JW5cR+r6VWAUPPH4pyIRrnuvMu0tuji2fl /XaAG91WjULHt1HeduPINA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1727656386; x= 1727742786; bh=Hp5/nn/3QDR5JBTLKgHjoUDAyH2rog0iohLTOCcL6FQ=; b=e oLk5rF4gGKL1SBXisYBgTvU/AHGoZdVPtOtpJygqyBEomj8iKRsDEXda/OPiKuLY ytge12PNFKGm5t3+a4lPHQD+YRNxYL4vYhmhM4qc7GG5/M/8f+Z1FDQZVpSr1QFQ tMj1FszjAxMQ7Fk/dNNB2CDpv45fIEgXgVzT1oUSWkDt9XVRBMoW7FYxI1jtPagF l2ZXyq88NlccBB+B24GNUsrvFPkvtHIttYjpgr6PHme7O7WEcFi4wUQ5U5w/0mDW PBt4vrM02u5bMeEw1ZbtqKYbxOP9Y3+Gt5C4RMFghpbhOL6jm0txGm7GLgV60b8s rTjeubqgjLMszkNnskfVA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvddugedgfeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhepkfffgggfuffvfhfhjggtgfesthejredttddvjeen ucfhrhhomhepffhmihhtrhihucfiuhhtohhvuceoughmihhtrhihsehguhhtohhvrdguvg hvqeenucggtffrrghtthgvrhhnpedthfeuvddtveelgeeuleevvdejveehffevveehvdeu ffdtfefhvdeugefgtefgtdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpegumhhithhrhiesghhuthhovhdruggvvhdpnhgspghrtghpthhtohep vddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepuggrnhgtohhlsegurghntgholh drohhrghdprhgtphhtthhopeejfeehgeegseguvggssghughhsrdhgnhhurdhorhhg X-ME-Proxy: Feedback-ID: i07de48aa:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 29 Sep 2024 20:33:04 -0400 (EDT) Content-Language: en-US In-Reply-To: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> 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:292676 Archived-At: On 29/09/2024 06:30, 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? Would it be better if 'C-c ^ n' jumped across files? I.e. effectively called smerge-vc-next-conflict. Not sure if it would always jump to the next file when reaching the end of the current one, or only when all hunks are resolved. Anyway, that approach would require making the bindings global, I think. The prev/next ones, at least.