From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.bugs Subject: bug#60338: [PATCH] Add option to present server changes as diffs Date: Fri, 01 Sep 2023 05:18:20 +0000 Message-ID: <87sf7ywjxf.fsf@posteo.net> References: <87ilhy1dub.fsf@posteo.net> <877cs97kgb.fsf@posteo.net> <83jzw8yjv5.fsf@gnu.org> <877cs8g8oy.fsf@posteo.net> <83fs6wyhak.fsf@gnu.org> <87y1koerm6.fsf@posteo.net> <83bkhkyeze.fsf@gnu.org> <87v8fr6o86.fsf@posteo.net> <87zg52e12n.fsf@posteo.net> <871qi9q9uc.fsf@posteo.net> <87a5ww7qa3.fsf@gmail.com> <87jzvsdco1.fsf@posteo.net> <87zg2669kk.fsf@gmail.com> 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="17296"; mail-complaints-to="usenet@ciao.gmane.io" Cc: dmitry@gutov.dev, Eli Zaretskii , 60338@debbugs.gnu.org, Eshel Yaron To: =?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Sep 01 07:19:26 2023 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 1qbwZ4-0004KG-JP for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 01 Sep 2023 07:19:26 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbwYi-00042Q-V7; Fri, 01 Sep 2023 01:19:04 -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 1qbwYY-000425-G2 for bug-gnu-emacs@gnu.org; Fri, 01 Sep 2023 01:18:54 -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 1qbwYX-0003Dn-I5 for bug-gnu-emacs@gnu.org; Fri, 01 Sep 2023 01:18:54 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qbwYg-0001sH-7e for bug-gnu-emacs@gnu.org; Fri, 01 Sep 2023 01:19:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 01 Sep 2023 05:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60338 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 60338-submit@debbugs.gnu.org id=B60338.16935455207177 (code B ref 60338); Fri, 01 Sep 2023 05:19:02 +0000 Original-Received: (at 60338) by debbugs.gnu.org; 1 Sep 2023 05:18:40 +0000 Original-Received: from localhost ([127.0.0.1]:59692 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbwYJ-0001rh-Tl for submit@debbugs.gnu.org; Fri, 01 Sep 2023 01:18:40 -0400 Original-Received: from mout02.posteo.de ([185.67.36.66]:51879) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbwYG-0001rS-Qp for 60338@debbugs.gnu.org; Fri, 01 Sep 2023 01:18:38 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id C516B240104 for <60338@debbugs.gnu.org>; Fri, 1 Sep 2023 07:18:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1693545501; bh=D7//91VMCADAwag8bEiXoX7IKP3jQiyZFqAFFFbcwaE=; h=From:To:Cc:Subject:Autocrypt:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=DpK5NsajMywEBvTzBW9KKUXz9gPLwNEVVMrb1WwYVaWMqFqyW4H4ii/V1osI8Cf8a xacbU8iViiohCSA9k/DtkMUBCQvuUla838s5wV2XEJ6PjUdEtxO3+MKuGfONkVJfGZ 7rt8MDpVxy4gGMDddWmWtSN5yD26wgu7txjAQbBfmDFCHCAOi84N2RZ94RHHv1ckMq KBpxYJPUd5Oh+Bi9qCCGtn6x765N12vF3yQrPFaWgodgjSpu11+e0FOTJ8yEYiL4F6 +8mKH9ib25YpdSexTamN4cmowYjnSSFKW8DqiTo+Lci5FG2rliI3CWKLfU4c2tQAty 8jBAG1+ZuctKA== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RcRBj025jz9rxH; Fri, 1 Sep 2023 07:18:20 +0200 (CEST) In-Reply-To: <87zg2669kk.fsf@gmail.com> ("=?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?="'s message of "Fri, 01 Sep 2023 01:06:35 +0100") Autocrypt: addr=philipk@posteo.net; keydata= mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0 mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof z4oM 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:268862 Archived-At: Jo=C3=A3o T=C3=A1vora writes: > Hello, > > I've finally pushed this to master, after working on mostly on the user > confirmation logic. I deprecated `eglot-confirm-server-initiated-edits' > (had crap semantics anyway) and replaced it with a shiny new > 'eglot-confirm-server-edits', with a simpler name but much more powerful > (see its docstring). > > I left in Philip's new implementation of the diff confirmation but I > didn't make it the default (although it's my preferred one) because it > might appeal to everyone used to the "summary" prompt. > > Please have a look, give it some testing, and tell me if I missed > anything. > > Thanks to Philip for the original idea. Thank you very much for finishing up the patch to the end. > Jo=C3=A3o