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#74509: Feature request - smerge-mode Date: Sat, 21 Dec 2024 10:11:30 -0500 Message-ID: References: <86bjxx817w.fsf@gnu.org> <86plll8lt0.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="33104"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Branislav =?UTF-8?Q?Zahradn=C3=ADk?= , 74509@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Dec 21 16:12:17 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 1tP19M-0008Sj-Q9 for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 21 Dec 2024 16:12:17 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tP19B-0002Za-D3; Sat, 21 Dec 2024 10:12:05 -0500 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 1tP199-0002ZO-Ca for bug-gnu-emacs@gnu.org; Sat, 21 Dec 2024 10:12:03 -0500 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 1tP197-0001ur-VK for bug-gnu-emacs@gnu.org; Sat, 21 Dec 2024 10:12:02 -0500 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=W+MUVirw5pcjjN25aQ/I6tIVMAjdkzS8gAovC5/bHXc=; b=hB6EJCB0plXbOJQ72MNgR3CB+WS+nKxjKexJ64zx7gKqu7YoTQcDu7hmC/+7tUD4aysnfxLYquA097ZN6KRkjKu8UCjcv6C/O+RUMX3By/D1jPoC5HsucqasH2y2KnjTDOpVocjl6YncH1r/+DG9Pk9Av6p08hGgZKEwjpd+gC4eQu5yIP+xLWvpJx8xUDk0hM1qmmKvGkbqz6B/aCU2vU81pgrlperVrIYq4G12aQY5tvsA7klhOvAjPRr06lOjcdiCkKf7TB0eBssRMpGGCq5RlqgDdHswlvhQJ8cSWJLl6Q55m+pKlfLIXZSLGpB3bPMkoHE+kcXfRK0OObDXxw==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tP197-0008Rd-Ni for bug-gnu-emacs@gnu.org; Sat, 21 Dec 2024 10:12:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 21 Dec 2024 15:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74509 X-GNU-PR-Package: emacs Original-Received: via spool by 74509-submit@debbugs.gnu.org id=B74509.173479390032428 (code B ref 74509); Sat, 21 Dec 2024 15:12:01 +0000 Original-Received: (at 74509) by debbugs.gnu.org; 21 Dec 2024 15:11:40 +0000 Original-Received: from localhost ([127.0.0.1]:47289 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tP18l-0008Qx-Vu for submit@debbugs.gnu.org; Sat, 21 Dec 2024 10:11:40 -0500 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:5519) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tP18j-0008Qi-JA for 74509@debbugs.gnu.org; Sat, 21 Dec 2024 10:11:38 -0500 Original-Received: from pmg3.iro.umontreal.ca (localhost [127.0.0.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 20DA64418FF; Sat, 21 Dec 2024 10:11:32 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1734793891; bh=zQ0r5iQ5ZcFvFuGztz121+0597xBKzI42s3o7xAZT0M=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=aMFORuc2hwmQZcZ0ToQChsx5epGH0bEfZV+vvHFhxN60P3QN2lNhIGE0FG2U+HZGD 0KIELu4arqtlRgKvkTJRRVumVHyjmTlzktF+61mg07rg9AXvQZvAA5xeyLUJ58HyBB 2qtp9cVso22JDOC8EV3rRnOK0bzIxskGFx6r5piGFVzrfAfXdr/cy8A9IbRehIO8Sy L+82CtyOE4zh4eie0frEX4rO2DvO6/yYHW3qtj8fjLyxAPdCpbPBvH4js2Wb4ukOKb w/X/TFAWuSsbmsrnX23Oa/AZ5znjYtBHBk/HF9ug7ahOZc7TFv7gYSooU5hT7tYFfR t/XM8DBQvTxew== Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 44BAD4418ED; Sat, 21 Dec 2024 10:11:31 -0500 (EST) Original-Received: from asado (unknown [199.119.74.1]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 09A1612039E; Sat, 21 Dec 2024 10:11:31 -0500 (EST) In-Reply-To: <86plll8lt0.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 21 Dec 2024 10:47:23 +0200") 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:297530 Archived-At: > How should we go about this bug report? > Can we make some progress here? Or should we close it as wontfix? No, I think his commands make sense. We just need to improve them so they also work with 3-part conflicts. Stefan