From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#73544: smerge key bindings awkward Date: Mon, 30 Sep 2024 08:28:33 -0400 Message-ID: References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> <86wmit2xa0.fsf@gnu.org> Reply-To: Stefan Monnier Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="1847"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 73544@debbugs.gnu.org, Dmitry Gutov , dancol@dancol.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Sep 30 14:29: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 1svFX9-0000Ix-M3 for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 30 Sep 2024 14:29:48 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1svFX3-0001mt-WB; Mon, 30 Sep 2024 08:29:42 -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 1svFX2-0001i8-HX for bug-gnu-emacs@gnu.org; Mon, 30 Sep 2024 08:29:40 -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 1svFX2-0003Hk-4o for bug-gnu-emacs@gnu.org; Mon, 30 Sep 2024 08:29:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=BYgBk/bAMojOph6pkh8V2zA+SJzLymy/asEwihpgdTg=; b=DHoGbMT2GUraLi/l8caRl+i9eC5vPU6QTXrzU0aT80pH5K1avKaVNB7oD8CzGvjDSwtTBv1iI/GYC/QXrOcgXlbUBbLBeqYJymSqNFBM4e+nuCg80s3NDR3VOZ4eReNkP/vOd8kQBtNcqiEA6mcnKN+eCc36sfRmuhDnLmQX0hAmrDDC0SC1Wfjk9pru/FtwpfBm0hBYDGtvvahPxpjhnbjw28sqihivPOtxwtfxmfxmoNcE4Dfq4OetYVMBXrU5/LucqL1q7HpBmdJu94L9jZ4qZjvEx1v+Bw8K5VIjInGNGn2y9lpfoFqLf5iHyNFZTHOiGQLMwkLL8SRE2iwWmQ==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1svFXY-000837-Ef for bug-gnu-emacs@gnu.org; Mon, 30 Sep 2024 08:30:12 -0400 X-Loop: help-debbugs@gnu.org 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 Original-Received: via spool by 73544-submit@debbugs.gnu.org id=B73544.172769936730594 (code B ref 73544); Mon, 30 Sep 2024 12:30:12 +0000 Original-Received: (at 73544) by debbugs.gnu.org; 30 Sep 2024 12:29:27 +0000 Original-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 Original-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 Original-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== Original-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) Original-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) In-Reply-To: <86wmit2xa0.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 30 Sep 2024 14:31:19 +0300") 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:292709 Archived-At: > 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