From unknown Thu Aug 14 21:50:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73544: smerge key bindings awkward 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-GNU-PR-Keywords: To: 73544@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172758065521153 (code B ref -1); Sun, 29 Sep 2024 03:31:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Sep 2024 03:30:55 +0000 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 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 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 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==; 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 Date: Sat, 28 Sep 2024 23:30:13 -0400 From: Daniel Colascione User-Agent: K-9 Mail for Android Message-ID: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> MIME-Version: 1.0 Content-Type: multipart/alternative; boundary=----LLQN5RKHWN3H308P2APOQ9IRRQOPVR Content-Transfer-Encoding: 7bit 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-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) ------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-- From unknown Thu Aug 14 21:50:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73544: smerge key bindings awkward Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 29 Sep 2024 06:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73544 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Daniel Colascione , Stefan Monnier , Dmitry Gutov Cc: 73544@debbugs.gnu.org Received: via spool by 73544-submit@debbugs.gnu.org id=B73544.172759108919874 (code B ref 73544); Sun, 29 Sep 2024 06:25:02 +0000 Received: (at 73544) by debbugs.gnu.org; 29 Sep 2024 06:24:49 +0000 Received: from localhost ([127.0.0.1]:34463 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sunMO-0005AN-7g for submit@debbugs.gnu.org; Sun, 29 Sep 2024 02:24:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59594) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sunMM-00059r-CI for 73544@debbugs.gnu.org; Sun, 29 Sep 2024 02:24:47 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sumav-000319-9I; Sun, 29 Sep 2024 01:35:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=pnm2CSpPkw/8+yOHihxgLrLzTfJ6H917Vwzkgqqwo8E=; b=CVSvn/YP+Rm3 exakIH2DVd4tZk22tflgn6B6gsbO5Uy7vbBQF+PCnFqLmdjXTfE/8aXgTGmWc+gZyZ28RMilQCjZY Z6kinnqyvI4/X3K72dRMgTFJghQJ+mRNNbjkC+eCSrfheE6ZFLLzpPSo404knRjpAOxWgsr8q1JWU lR2Js8ABboOXsf46xfF81wKQgkJBvRJVN6KwZvZxiAWtcZBHjtbbO3xx/qaYu/woma/bBWdiWXiAi aI2LIV8Nhdpg8Mt7eR3gnMSOWkQpPorpb3TNAgVUCefHTtmdzyhCeqUtvvOSMtfYnxcVlcpA2AXHf /KtmNAN9jRz3XWYUxpU75w==; Date: Sun, 29 Sep 2024 08:35:42 +0300 Message-Id: <86zfnr3tu9.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> (message from Daniel Colascione on Sat, 28 Sep 2024 23:30:13 -0400) References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > Date: Sat, 28 Sep 2024 23:30:13 -0400 > From: Daniel Colascione > > 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? Adding people who might have opinions or suggestions. From unknown Thu Aug 14 21:50:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73544: smerge key bindings awkward 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 X-GNU-PR-Keywords: To: Daniel Colascione Cc: 73544@debbugs.gnu.org Received: via spool by 73544-submit@debbugs.gnu.org id=B73544.172765248027472 (code B ref 73544); Sun, 29 Sep 2024 23:28:04 +0000 Received: (at 73544) by debbugs.gnu.org; 29 Sep 2024 23:28:00 +0000 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 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 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) Received: by melete.silentflame.com (Postfix, from userid 1000) id EA91B7E0BF2; Mon, 30 Sep 2024 00:27:09 +0100 (BST) From: Sean Whitton In-Reply-To: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> (Daniel Colascione's message of "Sat, 28 Sep 2024 23:30:13 -0400") References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> Date: Mon, 30 Sep 2024 07:27:09 +0800 Message-ID: <8734lif3ci.fsf@melete.silentflame.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From unknown Thu Aug 14 21:50:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73544: smerge key bindings awkward 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 X-GNU-PR-Keywords: To: Daniel Colascione , 73544@debbugs.gnu.org Received: via spool by 73544-submit@debbugs.gnu.org id=B73544.172765642716171 (code B ref 73544); Mon, 30 Sep 2024 00:34:01 +0000 Received: (at 73544) by debbugs.gnu.org; 30 Sep 2024 00:33:47 +0000 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 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 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) 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 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 29 Sep 2024 20:33:04 -0400 (EDT) Message-ID: Date: Mon, 30 Sep 2024 03:33:02 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> Content-Language: en-US From: Dmitry Gutov In-Reply-To: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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. From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 29 21:35:45 2024 Received: (at control) by debbugs.gnu.org; 30 Sep 2024 01:35:45 +0000 Received: from localhost ([127.0.0.1]:43440 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sv5KC-0007jJ-WD for submit@debbugs.gnu.org; Sun, 29 Sep 2024 21:35:45 -0400 Received: from mail-ed1-f48.google.com ([209.85.208.48]:55304) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sv5KC-0007d2-0r for control@debbugs.gnu.org; Sun, 29 Sep 2024 21:35:44 -0400 Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-5c42e7adbddso5536566a12.2 for ; Sun, 29 Sep 2024 18:35:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727660046; x=1728264846; darn=debbugs.gnu.org; h=to:subject:message-id:date:mime-version:from:from:to:cc:subject :date:message-id:reply-to; bh=vuLWhc/H38Ov4Rw1LZBT2JyTBd1M/thIOMupyzNS+Ns=; b=Q6wu8/1YEIljkSkt60B2EHwhHfuTmNgjc1TV/IxoAjiWpcZjW4AC2ITn9i+lxW3+lB BMxhnGhnrXV80iDWbSuxAAf4obAS0+p4vKOZzv1LxRpxyp7XzuI3UWG5vWbK+ceSskag cjzTXi+juman/2rXJKv4Wc1AfLUTaayYX6w/ffHQK6N1hjTXZ8kN7rRjcb4b28TTVyxf T2NEvWyxYEjOSi4h6LkK+xGZThDRXju2jFWSvpEMYBAwimHb2gGn4ILTWQN0Sl3uA2g+ 6KjvB+wbGeLwvc69mMZEqXNw1tKP+4Gq1gg5vcu7f+co73pYMX/pbXbUMY6cajGhg3EA /dQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727660046; x=1728264846; h=to:subject:message-id:date:mime-version:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=vuLWhc/H38Ov4Rw1LZBT2JyTBd1M/thIOMupyzNS+Ns=; b=rHsEl5AS1oF+JvCbR8HnokozmpLn4oHed0nLrzwKUaL/WXs9WM8bbglV6YudSrdO5W SRlx83h1Lx/dmdu+mXpTAO8AZgnouzjwvK2WlychSO9yOCGRY3cmZ1afZC/wLggDZiWh QSwqsyvCo5/b7i7CC8wdRJm6+6ODaeRAUuO3ym458rMT7Jkq+vVbDBAmhm5yl2HGhQTz XvZRkmG6TEbUpV8eIwCeqIaiW884CXT40Up1mMFAWTbAFqn/MoaNSgtkDwkD0ANnI85x 4jUHE5RB8MiLt5kwHz6WbEoUJusDCseXQtiIodAPRzrNoeBht4eNoigqi8R24xP7TExB ZTOg== X-Gm-Message-State: AOJu0YyIicrvZ7bx87k6x1gIRm/g6yJ9SToSesC3d1uB0Wcd6q84bg1w Ir4Yk/608PV4JBWkWxFHEyE17aT8X+OrXcPMlsw21EX4OQnxiKdqpG64YMc7E0Ki/sPxZKK2BEh yX9VAN+4zmI9YpfpeuOqp4Jja8Olrag== X-Google-Smtp-Source: AGHT+IFS4WxXHHj9czK2ewJqUhTjQYjKpZCrcgWfSO9tSgtWIDVvJEgLctkB57I8dqkqGREX3rnEO5/pU9C5yR+7Bd4= X-Received: by 2002:a05:6402:1ed6:b0:5c5:c3e8:71ec with SMTP id 4fb4d7f45d1cf-5c88248eedfmr9514955a12.0.1727660046041; Sun, 29 Sep 2024 18:34:06 -0700 (PDT) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Sun, 29 Sep 2024 18:34:05 -0700 From: Stefan Kangas MIME-Version: 1.0 Date: Sun, 29 Sep 2024 18:34:05 -0700 Message-ID: Subject: control message for bug #73544 To: control@debbugs.gnu.org Content-Type: text/plain; charset="UTF-8" X-Spam-Score: -0.9 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.9 (-) severity 73544 wishlist quit From unknown Thu Aug 14 21:50:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73544: smerge key bindings awkward 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 X-GNU-PR-Keywords: To: Dmitry Gutov , 73544@debbugs.gnu.org Received: via spool by 73544-submit@debbugs.gnu.org id=B73544.172767150132582 (code B ref 73544); Mon, 30 Sep 2024 04:45:09 +0000 Received: (at 73544) by debbugs.gnu.org; 30 Sep 2024 04:45:01 +0000 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 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==; 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 Date: Sun, 29 Sep 2024 21:41:56 -0700 From: Daniel Colascione User-Agent: K-9 Mail for Android In-Reply-To: References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> Message-ID: <16EEA02F-E09C-4556-88F1-BA575239F354@dancol.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From unknown Thu Aug 14 21:50:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73544: smerge key bindings awkward Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 30 Sep 2024 11:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73544 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Dmitry Gutov , Stefan Monnier Cc: 73544@debbugs.gnu.org, dancol@dancol.org Received: via spool by 73544-submit@debbugs.gnu.org id=B73544.172769592812045 (code B ref 73544); Mon, 30 Sep 2024 11:33:02 +0000 Received: (at 73544) by debbugs.gnu.org; 30 Sep 2024 11:32:08 +0000 Received: from localhost ([127.0.0.1]:44847 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1svEdJ-00037o-T6 for submit@debbugs.gnu.org; Mon, 30 Sep 2024 07:32:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59290) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1svEdH-00036z-H4 for 73544@debbugs.gnu.org; Mon, 30 Sep 2024 07:32:05 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1svEce-0004k0-7S; Mon, 30 Sep 2024 07:31:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=EQLQ+RbVH1tDfBeBDFET4iW9LjDYv1lm7TVndQMo5zQ=; b=cuJvvGVbacw5 RcotXQszy4CGbUY41afVEYdIlkCwN3CfgrNq6AM2rTDJXHM3wZDPZuIe4/7Qk51fe7ghjGBFMtxA2 5t+yavtLZTYEPImEpCvteON9NVkthtLZfzveDeMLtTD6l4EN4IrYCI5egcIHkuRiqvIlqU94uHWpu 9x+MGbDjQQWzXiplSufkJHoHIvjHEkeWNi5IYr6ZpTPcoIiH/l1e7NRL80IWD4vM7XqX9Rd1VbT2Y VCZjLM1ZD8H0jfvLkaqDCYYmMIWbuHmXIdeqbSQrLy1Xgyz7BQRNtiFwioDNOCo9WM392Yfj0fI51 zGjeyoLCLyWF27GgDAnyyQ==; Date: Mon, 30 Sep 2024 14:31:19 +0300 Message-Id: <86wmit2xa0.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: (message from Dmitry Gutov on Mon, 30 Sep 2024 03:33:02 +0300) References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > Date: Mon, 30 Sep 2024 03:33:02 +0300 > From: Dmitry Gutov > > 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. Why does smerge-mode have to turn itself off when all conflicts are resolved? Stefan? From unknown Thu Aug 14 21:50:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73544: smerge key bindings awkward Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 30 Sep 2024 12:30:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73544 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Eli Zaretskii Cc: 73544@debbugs.gnu.org, Dmitry Gutov , dancol@dancol.org Received: via spool by 73544-submit@debbugs.gnu.org id=B73544.172769936730594 (code B ref 73544); Mon, 30 Sep 2024 12:30:12 +0000 Received: (at 73544) by debbugs.gnu.org; 30 Sep 2024 12:29:27 +0000 Received: from localhost ([127.0.0.1]:44941 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1svFWp-0007xO-Ib for submit@debbugs.gnu.org; Mon, 30 Sep 2024 08:29:27 -0400 Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:31444) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1svFWj-0007wx-SG for 73544@debbugs.gnu.org; Mon, 30 Sep 2024 08:29:26 -0400 Received: from pmg3.iro.umontreal.ca (localhost [127.0.0.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 7FFD44414CF; Mon, 30 Sep 2024 08:28:42 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1727699321; bh=OwRdbhJWVl2CSo4Ii44STCu/orDwYX8D4vwi6vjsEFI=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=aK4wke8+T6sqIw/KMsg6l5F1JJEuPUARbYruQWcSurYiOURGSUQCt95sO09luGzQC IL30AorPk0kzV1Td63MtLmZPvLSyNHA+VXXSj9vscL6JI8z3X7LGk8hwAfnPuMFpGV 7sltyVSL5Zt1qCxR8S/S/FsQJlTnGW0WfdMB33o8Wu/oK2eY3wQPwRsH6s6Q+ES7/3 T7D8IXX4GgegnxVmZ+NnjdsLPDsPfYKgQzq2iQnLhmYfzNZFCFF7yJwMNoHhZVGUxv v+kUG+XB8PjoRkraRhVxdm9O4dARggTIcVxanISMFm3ByU/YMchrZnjDDmXXcpBk0E FwHvj9TUKf0mA== Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 8F881441447; Mon, 30 Sep 2024 08:28:41 -0400 (EDT) Received: from pastel (unknown [216.154.14.167]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 5DE98120667; Mon, 30 Sep 2024 08:28:41 -0400 (EDT) From: Stefan Monnier In-Reply-To: <86wmit2xa0.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 30 Sep 2024 14:31:19 +0300") Message-ID: References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> <86wmit2xa0.fsf@gnu.org> Date: Mon, 30 Sep 2024 08:28:33 -0400 User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-SPAM-INFO: Spam detection results: 0 ALL_TRUSTED -1 Passed through trusted hosts only via SMTP AWL 0.171 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature DKIM_VALID_AU -0.1 Message has a valid DKIM or DK signature from author's domain DKIM_VALID_EF -0.1 Message has a valid DKIM or DK signature from envelope-from domain X-SPAM-LEVEL: X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > Why does smerge-mode have to turn itself off when all conflicts are > resolved? Stefan? It doesn't have to. It's just useless when all conflicts are resolved, so it's convenient for it to turn itself off in that case. It also lets you use the `SMerge` lighter in the mode line as an indication that there are still merge conflicts to resolve in the buffer. Stefan From unknown Thu Aug 14 21:50:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73544: smerge key bindings awkward 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 X-GNU-PR-Keywords: To: Eli Zaretskii Cc: 73544@debbugs.gnu.org, Dmitry Gutov , Daniel Colascione Received: via spool by 73544-submit@debbugs.gnu.org id=B73544.17276999974771 (code B ref 73544); Mon, 30 Sep 2024 12:40:06 +0000 Received: (at 73544) by debbugs.gnu.org; 30 Sep 2024 12:39:57 +0000 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 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 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== 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) 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) From: Stefan Monnier In-Reply-To: <86zfnr3tu9.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 29 Sep 2024 08:35:42 +0300") Message-ID: References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> <86zfnr3tu9.fsf@gnu.org> Date: Mon, 30 Sep 2024 08:39:11 -0400 User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-SPAM-INFO: Spam detection results: 0 ALL_TRUSTED -1 Passed through trusted hosts only via SMTP AWL 0.099 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature DKIM_VALID_AU -0.1 Message has a valid DKIM or DK signature from author's domain DKIM_VALID_EF -0.1 Message has a valid DKIM or DK signature from envelope-from domain X-SPAM-LEVEL: X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) >> 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 From unknown Thu Aug 14 21:50:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73544: smerge key bindings awkward Resent-From: Daniel Colascione Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 30 Sep 2024 14:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73544 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Eli Zaretskii , Stefan Monnier Cc: 73544@debbugs.gnu.org, dmitry@gutov.dev Received: via spool by 73544-submit@debbugs.gnu.org id=B73544.17277078968082 (code B ref 73544); Mon, 30 Sep 2024 14:52:02 +0000 Received: (at 73544) by debbugs.gnu.org; 30 Sep 2024 14:51:36 +0000 Received: from localhost ([127.0.0.1]:45289 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1svHkO-00026E-1t for submit@debbugs.gnu.org; Mon, 30 Sep 2024 10:51:36 -0400 Received: from dancol.org ([96.126.100.184]:38938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1svHkK-00025j-I2 for 73544@debbugs.gnu.org; Mon, 30 Sep 2024 10:51:34 -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:CC:To:From:Date:Sender:Reply-To: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=IN4fjUQf1bCAN0mXfABw3mu+TyLl3HYwFBNVvor6Mxk=; b=KzAWiqc91gVfL5Wl7wnS5Enl20 jCOfptzzqI6CvOVqiTLQolND4baGeo5FuPxuRbtXwnPnhNOlSle/V7z1iFLnQX14Ld5t+wXx4yBOD ZIddc+hqW+6F3fabMWVxgOv18wJBi0Rag0pMaLcYCpMStcSS66pqY4O8SMbNaznR+jMTLDEf2WGER lvdNFOJA+ykV/hQRjbTjs5my6n9G4Bvzh/RkCH4y7Wbfpi5KSV6Os25AvAciEU5AnTzJxSqGezRXi YQdkzTAabmMm0tWfKAUmCuDwokVzexybasD1cJ35PNCiJyG4iz0TUgDQ5vQJAqCPRxpwmqHaa5zfo BSLPTqPQ==; Received: from [12.51.135.7] (port=37226 helo=[127.0.0.1]) by dancol.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.96) (envelope-from ) id 1svHje-0003nA-2p; Mon, 30 Sep 2024 10:50:51 -0400 Date: Mon, 30 Sep 2024 07:50:50 -0700 From: Daniel Colascione User-Agent: K-9 Mail for Android In-Reply-To: <86msjp2tya.fsf@gnu.org> References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> <86wmit2xa0.fsf@gnu.org> <86msjp2tya.fsf@gnu.org> Message-ID: <586D4862-3603-46AE-9A8F-163BD7FB2FAA@dancol.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On September 30, 2024 5:43:09 AM PDT, Eli Zaretskii wrote= : >> From: Stefan Monnier >> Cc: Dmitry Gutov , dancol@dancol=2Eorg, 73544@deb= bugs=2Egnu=2Eorg >> Date: Mon, 30 Sep 2024 08:28:33 -0400 >>=20 >> > Why does smerge-mode have to turn itself off when all conflicts are >> > resolved? Stefan? >>=20 >> It doesn't have to=2E It's just useless when all conflicts are resolve= d, >> so it's convenient for it to turn itself off in that case=2E It also l= ets >> you use the `SMerge` lighter in the mode line as an indication that >> there are still merge conflicts to resolve in the buffer=2E > >That's what I thought=2E > >So maybe a possible solution to Daniel's problem would be a (maybe >optional) behavior, whereby when conflicts are resolved, smerge-mode >doesn't turn itself off, but instead changes the lighter to indicate >that there are no more conflicts? > >Daniel, would that solve your problem? If it would, I think it's >better than making the "C-x ^" keymap global, which would have a >significant global effect, and might break someone's key bindings=2E That's a solution, sure=2E We could also have the lighter contain a visual= indication of the number of conflict regions in the buffer, like flymake= =2E From unknown Thu Aug 14 21:50:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73544: smerge key bindings awkward Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 13 Oct 2024 11:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73544 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Daniel Colascione Cc: 73544@debbugs.gnu.org, dmitry@gutov.dev, monnier@iro.umontreal.ca Received: via spool by 73544-submit@debbugs.gnu.org id=B73544.172881759911810 (code B ref 73544); Sun, 13 Oct 2024 11:07:01 +0000 Received: (at 73544) by debbugs.gnu.org; 13 Oct 2024 11:06:39 +0000 Received: from localhost ([127.0.0.1]:50377 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1szwQo-00034Q-KP for submit@debbugs.gnu.org; Sun, 13 Oct 2024 07:06:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59622) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1szwQm-00034A-9d for 73544@debbugs.gnu.org; Sun, 13 Oct 2024 07:06:37 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1szwQR-0003bt-0H; Sun, 13 Oct 2024 07:06:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=wHm90gul6f3uay2kjO2VpfdJc1jEoDLVTOoSY5Uttes=; b=HTQdYaK3CTfT kBTtGboqD39T/e3i/NYuzEEPHvim86Ps9W/YAToz44EzvkGBAG7tZySTooGHRtkXuXxT0QSWc7CPb E1DXD41Y95hKKv3ECcUyqjiKXSYgiVDBf4JWnK315a8I2gV9k9uUNr1VAhpVkdf1XgvsKTy6GHImM gN9dA+qvtEQoQEPvOWRTzYxA7NYL67AKS3KT8YkQszbl7+JykP/YcpULOTav1ps+MLe2mSQyKK36f PsmY9eFB7WsTwxejIzMjw2hj0yjLnrpysS+pEmd5Qk9jegRATOOFqPiQeXRBK+y4at7fhXARxu2hi HabWrfR1pHXBHrNKVrEHNw==; Date: Sun, 13 Oct 2024 14:06:11 +0300 Message-Id: <86r08ktg7w.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: <586D4862-3603-46AE-9A8F-163BD7FB2FAA@dancol.org> (message from Daniel Colascione on Mon, 30 Sep 2024 07:50:50 -0700) References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> <86wmit2xa0.fsf@gnu.org> <86msjp2tya.fsf@gnu.org> <586D4862-3603-46AE-9A8F-163BD7FB2FAA@dancol.org> X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > Date: Mon, 30 Sep 2024 07:50:50 -0700 > From: Daniel Colascione > CC: dmitry@gutov.dev, 73544@debbugs.gnu.org > > > > On September 30, 2024 5:43:09 AM PDT, Eli Zaretskii wrote: > >> From: Stefan Monnier > >> Cc: Dmitry Gutov , dancol@dancol.org, 73544@debbugs.gnu.org > >> Date: Mon, 30 Sep 2024 08:28:33 -0400 > >> > >> > Why does smerge-mode have to turn itself off when all conflicts are > >> > resolved? Stefan? > >> > >> It doesn't have to. It's just useless when all conflicts are resolved, > >> so it's convenient for it to turn itself off in that case. It also lets > >> you use the `SMerge` lighter in the mode line as an indication that > >> there are still merge conflicts to resolve in the buffer. > > > >That's what I thought. > > > >So maybe a possible solution to Daniel's problem would be a (maybe > >optional) behavior, whereby when conflicts are resolved, smerge-mode > >doesn't turn itself off, but instead changes the lighter to indicate > >that there are no more conflicts? > > > >Daniel, would that solve your problem? If it would, I think it's > >better than making the "C-x ^" keymap global, which would have a > >significant global effect, and might break someone's key bindings. > > > That's a solution, sure. We could also have the lighter contain a visual indication of the number of conflict regions in the buffer, like flymake. Actually, I see that the first part of this is already there: we have a defcustom smerge-auto-leave, whose default is t. So does it mean we can consider this bug fixed? From unknown Thu Aug 14 21:50:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73544: smerge key bindings awkward Resent-From: Daniel Colascione Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 13 Oct 2024 16:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73544 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Eli Zaretskii Cc: 73544@debbugs.gnu.org, dmitry@gutov.dev, monnier@iro.umontreal.ca Received: via spool by 73544-submit@debbugs.gnu.org id=B73544.172883545710633 (code B ref 73544); Sun, 13 Oct 2024 16:05:02 +0000 Received: (at 73544) by debbugs.gnu.org; 13 Oct 2024 16:04:17 +0000 Received: from localhost ([127.0.0.1]:52172 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t014r-0002lQ-1b for submit@debbugs.gnu.org; Sun, 13 Oct 2024 12:04:17 -0400 Received: from dancol.org ([96.126.100.184]:37346) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t014p-0002lG-24 for 73544@debbugs.gnu.org; Sun, 13 Oct 2024 12:04:15 -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:CC:To:From:Date:Sender:Reply-To: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=UP9pWJ4Ce14JoejLEDxnhSXeNWnNE462YRL/cWmyKdA=; b=OVLn+AgNu9KSebaGyEQUARg18t I+YFvpCp7fL7iGDIffq3zPP0GjfxrxKOzE3JbL+TUrisGCQQoRTO6+BVK53qrUFc0cZzMqjCTjHxa zaZ6atOEkdgWQnImFo2R0E9lKdQ613Som0QO15cqxRoRDCCcNj93CF6qIC7quF70KCJJj3p38Ts/B LUvDcUdlBPvSqDXBu1T7kgiX5i6sR37RJ9vEnw4QRJSTc4up52c4tbcbUDbG+lGVC/g8BTYwg0i9i Kq4QqBmHqyGqmoQOZPVBBbnaru56fZrEo2pqzB24jgZwe68g7+WIkFBK6k2ilISYg31WPBagqmOoi DxHH0Wyw==; Received: from 2603-9001-4203-1ab2-4d69-b3a9-eafd-5814.inf6.spectrum.com ([2603:9001:4203:1ab2:4d69:b3a9:eafd:5814]:33448 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 1t012F-0007Sd-1u; Sun, 13 Oct 2024 12:01:36 -0400 Date: Sun, 13 Oct 2024 12:01:33 -0400 From: Daniel Colascione User-Agent: K-9 Mail for Android In-Reply-To: <86r08ktg7w.fsf@gnu.org> References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> <86wmit2xa0.fsf@gnu.org> <86msjp2tya.fsf@gnu.org> <586D4862-3603-46AE-9A8F-163BD7FB2FAA@dancol.org> <86r08ktg7w.fsf@gnu.org> Message-ID: <931560E0-E032-4570-A4A4-378215660C25@dancol.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On October 13, 2024 7:06:11 AM EDT, Eli Zaretskii wrote: >> Date: Mon, 30 Sep 2024 07:50:50 -0700 >> From: Daniel Colascione >> CC: dmitry@gutov=2Edev, 73544@debbugs=2Egnu=2Eorg >>=20 >>=20 >>=20 >> On September 30, 2024 5:43:09 AM PDT, Eli Zaretskii wr= ote: >> >> From: Stefan Monnier >> >> Cc: Dmitry Gutov , dancol@dancol=2Eorg, 73544@= debbugs=2Egnu=2Eorg >> >> Date: Mon, 30 Sep 2024 08:28:33 -0400 >> >>=20 >> >> > Why does smerge-mode have to turn itself off when all conflicts ar= e >> >> > resolved? Stefan? >> >>=20 >> >> It doesn't have to=2E It's just useless when all conflicts are reso= lved, >> >> so it's convenient for it to turn itself off in that case=2E It als= o lets >> >> you use the `SMerge` lighter in the mode line as an indication that >> >> there are still merge conflicts to resolve in the buffer=2E >> > >> >That's what I thought=2E >> > >> >So maybe a possible solution to Daniel's problem would be a (maybe >> >optional) behavior, whereby when conflicts are resolved, smerge-mode >> >doesn't turn itself off, but instead changes the lighter to indicate >> >that there are no more conflicts? >> > >> >Daniel, would that solve your problem? If it would, I think it's >> >better than making the "C-x ^" keymap global, which would have a >> >significant global effect, and might break someone's key bindings=2E >>=20 >>=20 >> That's a solution, sure=2E We could also have the lighter contain a vis= ual indication of the number of conflict regions in the buffer, like flymak= e=2E=20 > >Actually, I see that the first part of this is already there: we have >a defcustom smerge-auto-leave, whose default is t=2E So does it mean we >can consider this bug fixed? The default is what produces the problem=2E From unknown Thu Aug 14 21:50:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73544: smerge key bindings awkward Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 13 Oct 2024 16:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73544 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Daniel Colascione Cc: 73544@debbugs.gnu.org, dmitry@gutov.dev, monnier@iro.umontreal.ca Received: via spool by 73544-submit@debbugs.gnu.org id=B73544.172883609912609 (code B ref 73544); Sun, 13 Oct 2024 16:15:01 +0000 Received: (at 73544) by debbugs.gnu.org; 13 Oct 2024 16:14:59 +0000 Received: from localhost ([127.0.0.1]:52191 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t01FD-0003HI-Bq for submit@debbugs.gnu.org; Sun, 13 Oct 2024 12:14:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46682) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t01FA-0003H5-Qm for 73544@debbugs.gnu.org; Sun, 13 Oct 2024 12:14:58 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t01Ep-0004eG-1V; Sun, 13 Oct 2024 12:14:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=eV0GoIdVXvfk/fTkEcNf6ZEaM9hVTMxenf/kgV0Fgew=; b=cJQuaA53ZMLC uW37gj0w025vxvtlNHqQeAqo2MWITLDlRgTgIHuV+PMmUFjzUh8eyhsjmvRfh5vKutuN/cocS3yct jJJEyjrx84aFRSRKXzET7ccCMU/DP66klS2eQ/dJ5Xibv1bbfmul8wBHLl3PGdStqoBQ7iISFDX+V IHKkeVmU8ovajxXjEn49q9F2n1n26h8bpxUK9pj7y/BFPT7TTXV0K+3f7TgVjqirXmDEHjb6IMVHG jQMg0q0fROejiL/4eVnRuMBPeh/r2aB7ePJOdlV3y/WRrrArX66XyF2hjWzuLkO7auxy0Q2QY5md9 xlM2/z0h6VKGMB46PhUMNg==; Date: Sun, 13 Oct 2024 19:13:49 +0300 Message-Id: <86bjzot1z6.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: <931560E0-E032-4570-A4A4-378215660C25@dancol.org> (message from Daniel Colascione on Sun, 13 Oct 2024 12:01:33 -0400) References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> <86wmit2xa0.fsf@gnu.org> <86msjp2tya.fsf@gnu.org> <586D4862-3603-46AE-9A8F-163BD7FB2FAA@dancol.org> <86r08ktg7w.fsf@gnu.org> <931560E0-E032-4570-A4A4-378215660C25@dancol.org> X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > Date: Sun, 13 Oct 2024 12:01:33 -0400 > From: Daniel Colascione > CC: monnier@iro.umontreal.ca, dmitry@gutov.dev, 73544@debbugs.gnu.org > > > > On October 13, 2024 7:06:11 AM EDT, Eli Zaretskii wrote: > >> Date: Mon, 30 Sep 2024 07:50:50 -0700 > >> From: Daniel Colascione > >> CC: dmitry@gutov.dev, 73544@debbugs.gnu.org > >> > >Actually, I see that the first part of this is already there: we have > >a defcustom smerge-auto-leave, whose default is t. So does it mean we > >can consider this bug fixed? > > The default is what produces the problem. Sure, but you can customize it according to your needs. It's been the default for the last 24 years, so I think reversing it after such a long time would need a lot of complaints. From unknown Thu Aug 14 21:50:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73544: smerge key bindings awkward Resent-From: Daniel Colascione Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 13 Oct 2024 17:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73544 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Eli Zaretskii Cc: 73544@debbugs.gnu.org, dmitry@gutov.dev, monnier@iro.umontreal.ca Received: via spool by 73544-submit@debbugs.gnu.org id=B73544.172883878221282 (code B ref 73544); Sun, 13 Oct 2024 17:00:02 +0000 Received: (at 73544) by debbugs.gnu.org; 13 Oct 2024 16:59:42 +0000 Received: from localhost ([127.0.0.1]:52240 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t01wT-0005XB-Ik for submit@debbugs.gnu.org; Sun, 13 Oct 2024 12:59:42 -0400 Received: from dancol.org ([96.126.100.184]:45372) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t01wQ-0005X1-5G for 73544@debbugs.gnu.org; Sun, 13 Oct 2024 12:59:40 -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:CC:To:From:Date:Sender:Reply-To: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=TvbipTT7AbArMF1CNZZxyfSeZuWDld+UWMqzl8kWM+I=; b=mm0BdDVhENzVCTe4XaxVpf5Gpu HbnD6bxXAUoTwdWyQPhHr1Y0wXIzU1/R6SfbXJA560UxvE3fdMm1QU7tzdWJU5Kc55IXNJCjot+IS 01pyE9ne966W1SLtLeMTSgCeotmFFKJ/2nmUYjJeAV/pTIFtK9vCpanwIhc6OrDPllqOFMIdt0D7x PZK3gebSjJzfX8ghKanZRbEuvt0AAzbFtcLUhbRrXyNvMzUD5fzvxMz0FDoMcmylIU+rETwdm4+2y 4onzG1LQ7xfslRAYZFUGp6PU+mez+VkjrwjxpTez1zW7c/PWtILmR7kqIUS8AnuPQVn/NG/ZINIWN SGvmPp/g==; Received: from [2600:1006:b101:ae4e:0:4e:ec0f:5901] (port=54482 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 1t01tu-0007bc-32; Sun, 13 Oct 2024 12:57:03 -0400 Date: Sun, 13 Oct 2024 12:57:01 -0400 From: Daniel Colascione User-Agent: K-9 Mail for Android In-Reply-To: <86bjzot1z6.fsf@gnu.org> References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> <86wmit2xa0.fsf@gnu.org> <86msjp2tya.fsf@gnu.org> <586D4862-3603-46AE-9A8F-163BD7FB2FAA@dancol.org> <86r08ktg7w.fsf@gnu.org> <931560E0-E032-4570-A4A4-378215660C25@dancol.org> <86bjzot1z6.fsf@gnu.org> Message-ID: <122D1E12-D860-41AC-A1CF-18ECCA20AD60@dancol.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On October 13, 2024 12:13:49 PM EDT, Eli Zaretskii wrote: >> Date: Sun, 13 Oct 2024 12:01:33 -0400 >> From: Daniel Colascione >> CC: monnier@iro=2Eumontreal=2Eca, dmitry@gutov=2Edev, 73544@debbugs=2Eg= nu=2Eorg >>=20 >>=20 >>=20 >> On October 13, 2024 7:06:11 AM EDT, Eli Zaretskii wrot= e: >> >> Date: Mon, 30 Sep 2024 07:50:50 -0700 >> >> From: Daniel Colascione >> >> CC: dmitry@gutov=2Edev, 73544@debbugs=2Egnu=2Eorg >> >>=20 >> >Actually, I see that the first part of this is already there: we have >> >a defcustom smerge-auto-leave, whose default is t=2E So does it mean = we >> >can consider this bug fixed? >>=20 >> The default is what produces the problem=2E > >Sure, but you can customize it according to your needs=2E It's been the >default for the last 24 years, so I think reversing it after such a >long time would need a lot of complaints=2E It's a defect in the user interface=2E Going NIMBY on the core is no way t= o make great software=2E We need to be able to add new key bindings, new fe= atures, and sand down high friction parts of the UI, even if they've been b= umpy for a long time=2E=20 After a certain point, customizing the program to work around all the terr= ible inherited defaults the maintainers refuse to change becomes tantamount= to maintaining a fork=2E I guess that's why Doom exists=2E From unknown Thu Aug 14 21:50:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73544: smerge key bindings awkward Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 13 Oct 2024 19:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73544 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Daniel Colascione , Stefan Kangas , Andrea Corallo , Stefan Monnier Cc: 73544@debbugs.gnu.org, dmitry@gutov.dev Received: via spool by 73544-submit@debbugs.gnu.org id=B73544.172884699624566 (code B ref 73544); Sun, 13 Oct 2024 19:17:02 +0000 Received: (at 73544) by debbugs.gnu.org; 13 Oct 2024 19:16:36 +0000 Received: from localhost ([127.0.0.1]:55852 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t044u-0006Ny-Oi for submit@debbugs.gnu.org; Sun, 13 Oct 2024 15:16:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t044s-0006NX-1X for 73544@debbugs.gnu.org; Sun, 13 Oct 2024 15:16:31 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t03oc-0003Vk-CK; Sun, 13 Oct 2024 14:59:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=UuYCajD3sUbcZPAwFPHHarlaZCDM3rTOSe/T6jew/NI=; b=eUbbwTIp5GN0 fdwvVD9pGt93WEi7gxnaabmREfVp1Bvt3WyV2BqkLPAmXkwe+tzpoJ8o0w6hkfsqB2NN+4drktKZ9 MS+iFhagEGc27+5SulkCJztfWOnSWwljcmSkuWtCTXs9vV615phHQMrd6+yxbKCWcT58Mf4R9il0A xy5sX3EyM4rWAWTRSVOH/dt+CQCDhNjZ2F0gbwAOZqIcHtOuzhWu2h4ID7CjTT9adE2eYN3hHUMTp MRlgD+sQhuA1BP77gUNZeH6ZYvSanM9xx+muAgM9lydcHys4CGn42s5MG50A3eFSa9AoWmkiwGkxk P5kuldf+YPBv1BYpJcJ86A==; Date: Sun, 13 Oct 2024 21:58:47 +0300 Message-Id: <864j5fu8wo.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: <122D1E12-D860-41AC-A1CF-18ECCA20AD60@dancol.org> (message from Daniel Colascione on Sun, 13 Oct 2024 12:57:01 -0400) References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> <86wmit2xa0.fsf@gnu.org> <86msjp2tya.fsf@gnu.org> <586D4862-3603-46AE-9A8F-163BD7FB2FAA@dancol.org> <86r08ktg7w.fsf@gnu.org> <931560E0-E032-4570-A4A4-378215660C25@dancol.org> <86bjzot1z6.fsf@gnu.org> <122D1E12-D860-41AC-A1CF-18ECCA20AD60@dancol.org> X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > Date: Sun, 13 Oct 2024 12:57:01 -0400 > From: Daniel Colascione > CC: monnier@iro.umontreal.ca, dmitry@gutov.dev, 73544@debbugs.gnu.org > > >Sure, but you can customize it according to your needs. It's been the > >default for the last 24 years, so I think reversing it after such a > >long time would need a lot of complaints. > > It's a defect in the user interface. Going NIMBY on the core is no way to make great software. We need to be able to add new key bindings, new features, and sand down high friction parts of the UI, even if they've been bumpy for a long time. > > After a certain point, customizing the program to work around all the terrible inherited defaults the maintainers refuse to change becomes tantamount to maintaining a fork. I guess that's why Doom exists. How do we know that this is indeed a defect in the UI? The only way I know of is to hear the same complaints from enough users. Without that, it could be your personal opinion -- to which you are entitled, of course, and maybe it is even correct in some sense, but flipping the default based on your single opinion runs the risk of annoying a lot of people who maybe happen to like the current default. That said, I don't use SMerge enough to object to this change too strenuously, so if others (CC'ed) don't mind to make the change, I won't mind. From unknown Thu Aug 14 21:50:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73544: smerge key bindings awkward Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 17 Oct 2024 17:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73544 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Daniel Colascione Cc: 73544@debbugs.gnu.org, dmitry@gutov.dev, Eli Zaretskii Received: via spool by 73544-submit@debbugs.gnu.org id=B73544.172918670112172 (code B ref 73544); Thu, 17 Oct 2024 17:39:01 +0000 Received: (at 73544) by debbugs.gnu.org; 17 Oct 2024 17:38:21 +0000 Received: from localhost ([127.0.0.1]:35493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1US1-0003A8-NE for submit@debbugs.gnu.org; Thu, 17 Oct 2024 13:38:21 -0400 Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:3644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1URw-00039q-HD for 73544@debbugs.gnu.org; Thu, 17 Oct 2024 13:38:16 -0400 Received: from pmg1.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id 0A20B100055; Thu, 17 Oct 2024 13:37:45 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1729186664; bh=OnteRyggPnKUk4wJIXpXCs2GgPUl0KgWlcP0WFWifRI=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=mIINlgppxmJmWP59nTzCB4fZpwDKtY/uszKOUD+4LFvLYbR4Q9it26aSGoYtqQhE+ fSgW8Ki4Dd6QA1Mibi1xZoo2njRrdpCkY3h1ImrYnrbRPUqVDMxAhCguGBId9E7nkO V9mFOrGLYn3zxlmI8KnHMFR/FEnpbPxUlmDzl+45MNHcHtlWrM2sBF9mu0Pjjcg5nf QAUTK8gORg31CeUJRtMjfNciIJpnz0w7sR04o16HmgEWby4DqL+5pTJqswdQf4qssp 1zFvqdU6fRpFM1v6IO6Acmczy7VX78AVPwYNLFoRIM3/JHG/Gr5clkd4h75vSWV0Mi BsWlB29VyG+EQ== Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id 633B7100042; Thu, 17 Oct 2024 13:37:44 -0400 (EDT) Received: from alfajor (unknown [23.233.149.155]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 4231012034F; Thu, 17 Oct 2024 13:37:44 -0400 (EDT) From: Stefan Monnier In-Reply-To: <122D1E12-D860-41AC-A1CF-18ECCA20AD60@dancol.org> (Daniel Colascione's message of "Sun, 13 Oct 2024 12:57:01 -0400") Message-ID: References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> <86wmit2xa0.fsf@gnu.org> <86msjp2tya.fsf@gnu.org> <586D4862-3603-46AE-9A8F-163BD7FB2FAA@dancol.org> <86r08ktg7w.fsf@gnu.org> <931560E0-E032-4570-A4A4-378215660C25@dancol.org> <86bjzot1z6.fsf@gnu.org> <122D1E12-D860-41AC-A1CF-18ECCA20AD60@dancol.org> Date: Thu, 17 Oct 2024 13:37:43 -0400 User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-SPAM-INFO: Spam detection results: 0 ALL_TRUSTED -1 Passed through trusted hosts only via SMTP AWL -0.031 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature DKIM_VALID_AU -0.1 Message has a valid DKIM or DK signature from author's domain DKIM_VALID_EF -0.1 Message has a valid DKIM or DK signature from envelope-from domain X-SPAM-LEVEL: X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > It's a defect in the user interface. IIUC the original scenario is: C-c ^ n C-c ^ n and here being annoyed that `n` was inserted (after flashing the buffer because `C-c ^` is not bound to anything) because that was the last conflict and `smerge-mode` turned itself off automatically. I'm not completely sure what is the exact defect you see here and how you suggest to fix it. E.g. do you also care to "fix" a case like emacs foo C-c ^ n where the user forgot to enable `smerge-mode`? How 'bout the patch below, which will end up preventing `read-key-sequence` from stopping at `C-c ^`? Stefan diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index aad3e302826..fa52286fee7 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -168,6 +168,10 @@ smerge-command-prefix (const :tag "none" "") string)) +;; Make it so `C-x ^ n' doesn't insert `n' but just signals an error +;; when SMerge mode is not enabled. +;;;###autoload (global-set-key "\C-c^" (make-sparse-keymap)) + (defvar-keymap smerge-mode-map (key-description smerge-command-prefix) smerge-basic-map) From unknown Thu Aug 14 21:50:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73544: smerge key bindings awkward Resent-From: Daniel Colascione Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 17 Oct 2024 18:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73544 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Stefan Monnier Cc: 73544@debbugs.gnu.org, dmitry@gutov.dev, Eli Zaretskii Received: via spool by 73544-submit@debbugs.gnu.org id=B73544.172919082424603 (code B ref 73544); Thu, 17 Oct 2024 18:48:02 +0000 Received: (at 73544) by debbugs.gnu.org; 17 Oct 2024 18:47:04 +0000 Received: from localhost ([127.0.0.1]:35616 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1VWU-0006OJ-Pr for submit@debbugs.gnu.org; Thu, 17 Oct 2024 14:47:03 -0400 Received: from dancol.org ([96.126.100.184]:48272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1VWO-0006O5-Eu for 73544@debbugs.gnu.org; Thu, 17 Oct 2024 14:46:57 -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:CC:To:From:Date:Sender:Reply-To: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=ThajHeb8QLDc9WUhIdrp/WqM4Aw1u5pk0fp+LZdKQek=; b=o69taF9DVgLE0jKHZSOO/AUNDH EliU1KqO53Fl+Q+tCA7AIalx8BPQvkhSoTeZ9nc3dYBvh72QiM06dZS/qvNcHfHjsfKslOE5Cnt3y kY+QONrrkC4oH9Gfp9xNTbGXfge2wV8Jn8XpEKpR0Iy2otfbNrXE8ALd61recFovWb1PdULsQPdrZ D25ulDZ0fptqch7jpsLOK0n6rwcOWPFOuMdVgoHCD26XdwVrTYFCxheD/qZ9f6OVjCiatk+eK+afn TeB4PGCNNeDt7JroFA5JvE6i07LHeOh41OoehCtpqe0i0K6a1iNak4WIqtPXbYroQOd1IZKTcHGt3 l5e3gD6g==; Received: from [2600:1006:b11e:df13:0:4e:11eb:c01] (port=58320 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 1t1VTi-0007su-0B; Thu, 17 Oct 2024 14:44:07 -0400 Date: Thu, 17 Oct 2024 14:44:06 -0400 From: Daniel Colascione User-Agent: K-9 Mail for Android In-Reply-To: References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> <86wmit2xa0.fsf@gnu.org> <86msjp2tya.fsf@gnu.org> <586D4862-3603-46AE-9A8F-163BD7FB2FAA@dancol.org> <86r08ktg7w.fsf@gnu.org> <931560E0-E032-4570-A4A4-378215660C25@dancol.org> <86bjzot1z6.fsf@gnu.org> <122D1E12-D860-41AC-A1CF-18ECCA20AD60@dancol.org> Message-ID: <82329D44-157D-43E5-88D0-CB381F2C6AB5@dancol.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On October 17, 2024 1:37:43 PM EDT, Stefan Monnier wrote: >> It's a defect in the user interface=2E > >IIUC the original scenario is: > > C-c ^ n > > C-c ^ n > >and here being annoyed that `n` was inserted (after flashing the buffer >because `C-c ^` is not bound to anything) because that was the last >conflict and `smerge-mode` turned itself off automatically=2E > >I'm not completely sure what is the exact defect you see here and how >you suggest to fix it=2E E=2Eg=2E do you also care to "fix" a case like > > emacs foo > C-c ^ n > >where the user forgot to enable `smerge-mode`? > >How 'bout the patch below, which will end up preventing `read-key-sequenc= e` >from stopping at `C-c ^`? > > > Stefan > > >diff --git a/lisp/vc/smerge-mode=2Eel b/lisp/vc/smerge-mode=2Eel >index aad3e302826=2E=2Efa52286fee7 100644 >--- a/lisp/vc/smerge-mode=2Eel >+++ b/lisp/vc/smerge-mode=2Eel >@@ -168,6 +168,10 @@ smerge-command-prefix > (const :tag "none" "") > string)) >=20 >+;; Make it so `C-x ^ n' doesn't insert `n' but just signals an error >+;; when SMerge mode is not enabled=2E >+;;;###autoload (global-set-key "\C-c^" (make-sparse-keymap)) >+ > (defvar-keymap smerge-mode-map > (key-description smerge-command-prefix) smerge-basic-map) >=20 > WFM From unknown Thu Aug 14 21:50:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73544: smerge key bindings awkward Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 21 Oct 2024 23:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73544 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Daniel Colascione Cc: 73544@debbugs.gnu.org, dmitry@gutov.dev, Eli Zaretskii Received: via spool by 73544-submit@debbugs.gnu.org id=B73544.172955501223070 (code B ref 73544); Mon, 21 Oct 2024 23:57:02 +0000 Received: (at 73544) by debbugs.gnu.org; 21 Oct 2024 23:56:52 +0000 Received: from localhost ([127.0.0.1]:53952 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t32GZ-000602-TN for submit@debbugs.gnu.org; Mon, 21 Oct 2024 19:56:52 -0400 Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:1917) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t32GX-0005zm-VI for 73544@debbugs.gnu.org; Mon, 21 Oct 2024 19:56:50 -0400 Received: from pmg3.iro.umontreal.ca (localhost [127.0.0.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 555D6444370; Mon, 21 Oct 2024 19:56:16 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1729554975; bh=SH4ONLM+C+3FLGN1k7anRELvLz7+cbhHlFukxYhFRUM=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=oEswt89fF/H4XhqvbdPaNv98JHSz9h04jbpC/sCvXDx9E8sFTMVf+10xAPyIlAJ9b YsXjIzaFfXEkUc9fBVwiVE92LGX/UA0NNGDZUxW/9IVShFXTcVSXrrSrLsREIp+opi KP4VnquDUnbgL/WahzsBJAtzmOyUDNdnMBIodk/Rsk8RzzzDUE/Pgl6onvt1YrQ/9x JWqpxGpYrFjFuhJQaI3+D8SxuPZRhisTbtj2WByEm0bGI14I6Vpa2ahlNXQHSpvprg jn99zNK7q41y5fHGk36uWiQoeKo99ViQYs5vaV/jf/ABK1aNe2qb7qSYGp6C/4Svuy y0o6SZtTTRtEg== Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 37A47444368; Mon, 21 Oct 2024 19:56:15 -0400 (EDT) Received: from alfajor (69-196-161-60.dsl.teksavvy.com [69.196.161.60]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 00815120971; Mon, 21 Oct 2024 19:56:14 -0400 (EDT) From: Stefan Monnier In-Reply-To: <82329D44-157D-43E5-88D0-CB381F2C6AB5@dancol.org> (Daniel Colascione's message of "Thu, 17 Oct 2024 14:44:06 -0400") Message-ID: References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> <86wmit2xa0.fsf@gnu.org> <86msjp2tya.fsf@gnu.org> <586D4862-3603-46AE-9A8F-163BD7FB2FAA@dancol.org> <86r08ktg7w.fsf@gnu.org> <931560E0-E032-4570-A4A4-378215660C25@dancol.org> <86bjzot1z6.fsf@gnu.org> <122D1E12-D860-41AC-A1CF-18ECCA20AD60@dancol.org> <82329D44-157D-43E5-88D0-CB381F2C6AB5@dancol.org> Date: Mon, 21 Oct 2024 19:56:12 -0400 User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-SPAM-INFO: Spam detection results: 0 ALL_TRUSTED -1 Passed through trusted hosts only via SMTP AWL -0.017 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature DKIM_VALID_AU -0.1 Message has a valid DKIM or DK signature from author's domain DKIM_VALID_EF -0.1 Message has a valid DKIM or DK signature from envelope-from domain X-SPAM-LEVEL: X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) >>How 'bout the patch below, which will end up preventing `read-key-sequence` >>from stopping at `C-c ^`? >> >> >> Stefan >> >> >>diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el >>index aad3e302826..fa52286fee7 100644 >>--- a/lisp/vc/smerge-mode.el >>+++ b/lisp/vc/smerge-mode.el >>@@ -168,6 +168,10 @@ smerge-command-prefix >> (const :tag "none" "") >> string)) >> >>+;; Make it so `C-x ^ n' doesn't insert `n' but just signals an error >>+;; when SMerge mode is not enabled. >>+;;;###autoload (global-set-key "\C-c^" (make-sparse-keymap)) >>+ >> (defvar-keymap smerge-mode-map >> (key-description smerge-command-prefix) smerge-basic-map) > > WFM Maintainers? Any objections? Stefan From unknown Thu Aug 14 21:50:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73544: smerge key bindings awkward Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 22 Oct 2024 05:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73544 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Stefan Monnier , Stefan Kangas , Andrea Corallo Cc: 73544@debbugs.gnu.org, dmitry@gutov.dev, dancol@dancol.org Received: via spool by 73544-submit@debbugs.gnu.org id=B73544.172957409018546 (code B ref 73544); Tue, 22 Oct 2024 05:15:02 +0000 Received: (at 73544) by debbugs.gnu.org; 22 Oct 2024 05:14:50 +0000 Received: from localhost ([127.0.0.1]:54288 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t37EH-0004p3-Nq for submit@debbugs.gnu.org; Tue, 22 Oct 2024 01:14:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35148) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t37EE-0004om-LG for 73544@debbugs.gnu.org; Tue, 22 Oct 2024 01:14:48 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t37Bb-0002n4-Ok; Tue, 22 Oct 2024 01:12:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=vkvc3/hkzKKEP7TR6aiuugOnCMpT8EUuphKjgnxzzoM=; b=ZVwYvK5cn0+s VWeZV0KeHiqOcQm4plYToFUJpBkYntr30pVPLZ4pxQYF2fJNiNVn5bRYuu6IRx9CFoG7n2YxQCaWQ 5QDPmA38xIOt1BOklWcZ05oXPUCi0S+eyfw4iCNn1dcz9kKZ5BUuQF4TWFkit7JJAoFPuQ2NxtHTQ 64vgXy1rDl8IxYq+kyvdYgb5n7rth+ntsnOAgII6PzZJiLukwqf391qG4gch6/fGAZfGUpaVkOlwt saOmSkcSw71lDRqd8xMHPyhO8aTJUlMyl9YHnrNnEDMihpRWgFJ1bSSE5/9OnKtruIS+ESE9iBsXI gfL8Cu7diCaVAku48qx0jQ==; Date: Tue, 22 Oct 2024 08:12:00 +0300 Message-Id: <86y12gg1r3.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: (message from Stefan Monnier on Mon, 21 Oct 2024 19:56:12 -0400) References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> <86wmit2xa0.fsf@gnu.org> <86msjp2tya.fsf@gnu.org> <586D4862-3603-46AE-9A8F-163BD7FB2FAA@dancol.org> <86r08ktg7w.fsf@gnu.org> <931560E0-E032-4570-A4A4-378215660C25@dancol.org> <86bjzot1z6.fsf@gnu.org> <122D1E12-D860-41AC-A1CF-18ECCA20AD60@dancol.org> <82329D44-157D-43E5-88D0-CB381F2C6AB5@dancol.org> X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Stefan Monnier > Cc: Eli Zaretskii , dmitry@gutov.dev, 73544@debbugs.gnu.org > Date: Mon, 21 Oct 2024 19:56:12 -0400 > > >>How 'bout the patch below, which will end up preventing `read-key-sequence` > >>from stopping at `C-c ^`? > >> > >> > >> Stefan > >> > >> > >>diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el > >>index aad3e302826..fa52286fee7 100644 > >>--- a/lisp/vc/smerge-mode.el > >>+++ b/lisp/vc/smerge-mode.el > >>@@ -168,6 +168,10 @@ smerge-command-prefix > >> (const :tag "none" "") > >> string)) > >> > >>+;; Make it so `C-x ^ n' doesn't insert `n' but just signals an error > >>+;; when SMerge mode is not enabled. > >>+;;;###autoload (global-set-key "\C-c^" (make-sparse-keymap)) > >>+ > >> (defvar-keymap smerge-mode-map > >> (key-description smerge-command-prefix) smerge-basic-map) > > > > WFM > > Maintainers? Any objections? Not here. From unknown Thu Aug 14 21:50:20 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Daniel Colascione Subject: bug#73544: closed (Re: bug#73544: smerge key bindings awkward) Message-ID: References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> X-Gnu-PR-Message: they-closed 73544 X-Gnu-PR-Package: emacs Reply-To: 73544@debbugs.gnu.org Date: Tue, 22 Oct 2024 14:21:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1729606862-22984-1" This is a multi-part message in MIME format... ------------=_1729606862-22984-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #73544: smerge key bindings awkward=20 which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 73544@debbugs.gnu.org. --=20 73544: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D73544 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1729606862-22984-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 73544-done) by debbugs.gnu.org; 22 Oct 2024 14:20:26 +0000 Received: from localhost ([127.0.0.1]:56826 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t3FkI-0005s2-K1 for submit@debbugs.gnu.org; Tue, 22 Oct 2024 10:20:26 -0400 Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:49390) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t3FkG-0005rn-9T for 73544-done@debbugs.gnu.org; Tue, 22 Oct 2024 10:20:25 -0400 Received: from pmg1.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id 52A7F100055; Tue, 22 Oct 2024 10:19:50 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1729606789; bh=85zfq86rjlWt2OiS6pgrVXeWRsRuZ+J+bMI5uqzdwck=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=Dw9M/jKPTKKOG6TveRHZ8pdQBDgF4w18ye3zedB0OX59aCDljYv1RtJVlmqQ03kwC ZiqMhhO6zctKiezw6Gh5asOsJOqoTLI2oFCjnO+r7GHiDnPrJHk5P/rLxkc08q1LvH ZpvNITRENMjBxp0FjF9RZsguWKxVAAeccDydoJB/wUncqMb/HwgtAxze+k+OMwUvuA dseCH9zAMILUgdLLA7PBJ1aZiY/LAdRX+LA8+QRxkUNbi0S//rFOnApLTxz9mxxyIy MLxZ64FyNFciRvGlLDEkxwBMcW7Mhm16ORwGDi2MXulcionHgqjVvOnm1dT+PrwmS5 8LRwWnUzpqxCg== Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id 2BF0810002E; Tue, 22 Oct 2024 10:19:49 -0400 (EDT) Received: from alfajor (unknown [23.233.149.155]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id F1E78120F5C; Tue, 22 Oct 2024 10:19:48 -0400 (EDT) From: Stefan Monnier To: Eli Zaretskii Subject: Re: bug#73544: smerge key bindings awkward In-Reply-To: <86y12gg1r3.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 22 Oct 2024 08:12:00 +0300") Message-ID: References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> <86wmit2xa0.fsf@gnu.org> <86msjp2tya.fsf@gnu.org> <586D4862-3603-46AE-9A8F-163BD7FB2FAA@dancol.org> <86r08ktg7w.fsf@gnu.org> <931560E0-E032-4570-A4A4-378215660C25@dancol.org> <86bjzot1z6.fsf@gnu.org> <122D1E12-D860-41AC-A1CF-18ECCA20AD60@dancol.org> <82329D44-157D-43E5-88D0-CB381F2C6AB5@dancol.org> <86y12gg1r3.fsf@gnu.org> Date: Tue, 22 Oct 2024 10:19:47 -0400 User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-SPAM-INFO: Spam detection results: 0 ALL_TRUSTED -1 Passed through trusted hosts only via SMTP AWL -0.017 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature DKIM_VALID_AU -0.1 Message has a valid DKIM or DK signature from author's domain DKIM_VALID_EF -0.1 Message has a valid DKIM or DK signature from envelope-from domain X-SPAM-LEVEL: X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 73544-done Cc: 73544-done@debbugs.gnu.org, dmitry@gutov.dev, Andrea Corallo , dancol@dancol.org, Stefan Kangas X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) >> Maintainers? Any objections? > Not here. Thanks, pushed to `master`. Stefan ------------=_1729606862-22984-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 29 Sep 2024 03:30:55 +0000 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 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 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 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==; 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 Date: Sat, 28 Sep 2024 23:30:13 -0400 From: Daniel Colascione To: bug-gnu-emacs@gnu.org Subject: smerge key bindings awkward User-Agent: K-9 Mail for Android Message-ID: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> MIME-Version: 1.0 Content-Type: multipart/alternative; boundary=----LLQN5RKHWN3H308P2APOQ9IRRQOPVR Content-Transfer-Encoding: 7bit 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-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) ------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-- ------------=_1729606862-22984-1--