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#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file Date: Tue, 20 Feb 2024 09:03:26 -0500 Message-ID: References: <865xykr79f.fsf@gnu.org> Reply-To: Stefan Monnier 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="21357"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Eli Zaretskii , 69220@debbugs.gnu.org To: Konstantin Kharlamov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Feb 20 15:05:08 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 1rcQk8-0005FR-0m for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 20 Feb 2024 15:05:08 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcQjl-0006rG-7v; Tue, 20 Feb 2024 09:04:46 -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 1rcQji-0006qt-5M for bug-gnu-emacs@gnu.org; Tue, 20 Feb 2024 09:04:42 -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 1rcQjh-0008Ql-Pt for bug-gnu-emacs@gnu.org; Tue, 20 Feb 2024 09:04:41 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rcQk2-0001pY-6f for bug-gnu-emacs@gnu.org; Tue, 20 Feb 2024 09:05:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 20 Feb 2024 14:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69220 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 69220-submit@debbugs.gnu.org id=B69220.17084378506961 (code B ref 69220); Tue, 20 Feb 2024 14:05:02 +0000 Original-Received: (at 69220) by debbugs.gnu.org; 20 Feb 2024 14:04:10 +0000 Original-Received: from localhost ([127.0.0.1]:44618 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcQj2-0001nl-1g for submit@debbugs.gnu.org; Tue, 20 Feb 2024 09:04:10 -0500 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:48687) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcQiz-0001nW-T5 for 69220@debbugs.gnu.org; Tue, 20 Feb 2024 09:03:58 -0500 Original-Received: from pmg2.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 93B9580758; Tue, 20 Feb 2024 09:03:30 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1708437809; bh=kZCH3k8k2ljNLVc65EyxZWAAbVeCywbsIRaYQMPdKGc=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=H0O7i7WgUXTCulPVOhkNq1+O2x7dwOwcUsVh3ZiqajtOY8T+PXG7kK7gwadV51+qN 7WHeqz6dyK+ngpZjuMlJBjwUheR7QwFS4NBOe+nPH+KcJYDKF/gkcGPoI2pHgwlqFH k4jQGcLDxdqXNmROfJEVkgr1WL5Wj3Ri/mjrsT5cIqKipTYPqw8BSHCO/Cv6A2kf36 b28gxnaSLTKxsUkcaOEIrwjrE0RcAPvF7ZlaiqxgVX8iTihRCSGw5UNet8WbgWqDsq 9QNBCE3oKZeFQ7x3Ew04JE5RjrDNN66+mBSF7l84xO/tZQF+E7CP3ahqInifArdVwI d2sqofVBxJAyA== Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 4D3FC8090D; Tue, 20 Feb 2024 09:03:29 -0500 (EST) Original-Received: from pastel (unknown [45.72.205.238]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 0AF5D12034B; Tue, 20 Feb 2024 09:03:29 -0500 (EST) In-Reply-To: (Konstantin Kharlamov's message of "Tue, 20 Feb 2024 06:24:10 +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:280327 Archived-At: >> BTW, your use of [upper base lower] as a completion table is both >> cute and horrible at the same time :-) > Hahah, why? =F0=9F=98=85 It's cute because it's concise and it kinda works. It's horrible because vectors are not among the supported formats for completion-tables: what you wrote will be assumed to be an obarray and what you wrote is not a correct obarray. The resulting behavior could be surprising (e.g. include more entries than the one you wrote). Stefan