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: Mon, 30 Sep 2024 07:50:50 -0700 Message-ID: <586D4862-3603-46AE-9A8F-163BD7FB2FAA@dancol.org> References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> <86wmit2xa0.fsf@gnu.org> <86msjp2tya.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="7954"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: K-9 Mail for Android Cc: 73544@debbugs.gnu.org, dmitry@gutov.dev To: Eli Zaretskii , Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Sep 30 16:51:49 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 1svHka-0001ro-BL for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 30 Sep 2024 16:51:49 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1svHkJ-0004ZI-SZ; Mon, 30 Sep 2024 10:51: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 1svHkI-0004Z5-CQ for bug-gnu-emacs@gnu.org; Mon, 30 Sep 2024 10:51: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 1svHkI-00028J-3R for bug-gnu-emacs@gnu.org; Mon, 30 Sep 2024 10:51:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=IN4fjUQf1bCAN0mXfABw3mu+TyLl3HYwFBNVvor6Mxk=; b=Xgorb1CEvtMfux82kVwVGLikvep0ov3yFZUKzLRFqQRQFQaOp2zoJqrbpgyfs3zRoaPKMYC1eRFXKEIZ4Wq5b+t6XMOFbiQpprcpFYR2AKkMrzs0r5YJvMHKmClQTgF+3JKDKgJCNV2iEtTLGZosEK4b3r3Zmkz2wSA6X+Genzo/MuKYhuMMhKkOK0OKZZsEivFAq5Zh+nkbPVHuBAetg6daDDdDLNDSvSsJh8tn8v8H1BS0LpyhJ4UVURUxqkhw4eIJ1n/Ay/HUK59uBDx0aeRGOM73jDfNp49Yb80WuboqVOl0AnSzcqhq3Mx3NUrw1Jj7JLp4cqBVPe7FueZHhA==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1svHko-00026o-9U for bug-gnu-emacs@gnu.org; Mon, 30 Sep 2024 10:52: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: 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 Original-Received: via spool by 73544-submit@debbugs.gnu.org id=B73544.17277078968082 (code B ref 73544); Mon, 30 Sep 2024 14:52:02 +0000 Original-Received: (at 73544) by debbugs.gnu.org; 30 Sep 2024 14:51:36 +0000 Original-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 Original-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==; Original-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 In-Reply-To: <86msjp2tya.fsf@gnu.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:292719 Archived-At: 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