From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Konstantin Kharlamov 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 17:10:57 +0300 Message-ID: <56a63a9d3230440385c5104dc10a4c8f042e28ae.camel@yandex.ru> References: <865xykr79f.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="23401"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Evolution 3.50.3 Cc: Eli Zaretskii , 69220@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Feb 20 15:12:01 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 1rcQqn-0005ng-Hj for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 20 Feb 2024 15:12:01 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcQqV-0001Kt-M1; Tue, 20 Feb 2024 09:11:43 -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 1rcQqS-0001Jk-MK for bug-gnu-emacs@gnu.org; Tue, 20 Feb 2024 09:11:40 -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 1rcQqS-0001re-DG for bug-gnu-emacs@gnu.org; Tue, 20 Feb 2024 09:11:40 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rcQqn-0001zB-Rv for bug-gnu-emacs@gnu.org; Tue, 20 Feb 2024 09:12:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Konstantin Kharlamov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 20 Feb 2024 14:12:01 +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.17084382897593 (code B ref 69220); Tue, 20 Feb 2024 14:12:01 +0000 Original-Received: (at 69220) by debbugs.gnu.org; 20 Feb 2024 14:11:29 +0000 Original-Received: from localhost ([127.0.0.1]:44631 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcQqH-0001yP-FL for submit@debbugs.gnu.org; Tue, 20 Feb 2024 09:11:29 -0500 Original-Received: from forward502c.mail.yandex.net ([178.154.239.210]:40186) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcQqB-0001yA-Eg for 69220@debbugs.gnu.org; Tue, 20 Feb 2024 09:11:28 -0500 Original-Received: from mail-nwsmtp-smtp-production-main-69.iva.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-69.iva.yp-c.yandex.net [IPv6:2a02:6b8:c0c:7c8c:0:640:8942:0]) by forward502c.mail.yandex.net (Yandex) with ESMTPS id 2C9F36111A; Tue, 20 Feb 2024 17:10:59 +0300 (MSK) Original-Received: by mail-nwsmtp-smtp-production-main-69.iva.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id vASVVq0To0U0-voQlngW1; Tue, 20 Feb 2024 17:10:58 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1708438258; bh=9h7G3hJDDBB3BR2NePRa2j2lernDYOvonWnc9qK0wjk=; h=References:Date:In-Reply-To:Cc:To:From:Subject:Message-ID; b=fBn6nEFzBPxc2eGdRjv7ZgDJKHkHWPcDfg16JioHg/cGrRLzCksYH3K426XxGtUi0 Zr1zikJSwF0l0+id2JHTfph+r7UjNQRlB0AncWzJqZgG+ORfcv7N0YjvPBcVNZIDpW jwc/mEyrMRwk3BS2854PqrqnxI+FFk35UPUfW+uA= Authentication-Results: mail-nwsmtp-smtp-production-main-69.iva.yp-c.yandex.net; dkim=pass header.i=@yandex.ru In-Reply-To: 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:280328 Archived-At: On Tue, 2024-02-20 at 09:03 -0500, Stefan Monnier wrote: > > > 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 >=20 > 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.=C2=A0 The resulting behavior could be > surprising (e.g. include more entries than the one you wrote). Hahah, that's funny, thank you for explanation!