From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?= Newsgroups: gmane.emacs.bugs Subject: bug#60338: [PATCH] Add option to present server changes as diffs Date: Sun, 18 Jun 2023 23:37:04 +0100 Message-ID: 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> 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="38619"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Eli Zaretskii , 60338@debbugs.gnu.org, Eshel Yaron To: Philip Kaludercic Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Jun 19 00:35: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 1qB0zW-0009sG-7s for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 19 Jun 2023 00:35:26 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qB0zB-0007JN-44; Sun, 18 Jun 2023 18:35:05 -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 1qB0z8-0007J1-Pl for bug-gnu-emacs@gnu.org; Sun, 18 Jun 2023 18:35:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qB0z8-0007VK-G0 for bug-gnu-emacs@gnu.org; Sun, 18 Jun 2023 18:35:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qB0z8-0000uN-1j for bug-gnu-emacs@gnu.org; Sun, 18 Jun 2023 18:35:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: =?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 18 Jun 2023 22:35: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.16871276943475 (code B ref 60338); Sun, 18 Jun 2023 22:35:02 +0000 Original-Received: (at 60338) by debbugs.gnu.org; 18 Jun 2023 22:34:54 +0000 Original-Received: from localhost ([127.0.0.1]:55216 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qB0z0-0000tz-CK for submit@debbugs.gnu.org; Sun, 18 Jun 2023 18:34:54 -0400 Original-Received: from mail-oo1-f51.google.com ([209.85.161.51]:56673) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qB0yy-0000th-Iv for 60338@debbugs.gnu.org; Sun, 18 Jun 2023 18:34:53 -0400 Original-Received: by mail-oo1-f51.google.com with SMTP id 006d021491bc7-55e41318185so679286eaf.1 for <60338@debbugs.gnu.org>; Sun, 18 Jun 2023 15:34:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687127686; x=1689719686; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=w5Aa3LD24pY7xgKClfMIVEIOAyEjdWAjoT8x7Dp9hng=; b=QwuiLMn1EcmlgSPOx0w5vp0EcMdRiss5Xb7Xaa6Ikt3vprDmpsi60hwI6ad5kkmamn oh5GDc926a5H4TzPIfp+d5xbdT7EmM/whqRseWSWlSmuOfzthd3lNOJzY5InX6a/Gdzq OIz/qmqep44wPYYV5n5p5X9yilA3HP6SgKHfroz/wlyM7LxUKFTttHoia3xMG3wQ0cV0 0gSLtV3lp7KpXpS/V7OorcQBmSmQO22wPcD2OXhTPV7rOeyBylIPF4wlW3ph7d3eyGh7 SJwDeSWTU4m5ZT2HpXTytGZ19zRGyMTo/3dpG9qCF7b7gUIqEP1I6KCoM2Y8Y1ZXwon1 t+5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687127686; x=1689719686; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w5Aa3LD24pY7xgKClfMIVEIOAyEjdWAjoT8x7Dp9hng=; b=K5xLFtfdOAtfTtUBIYKTK/W/swrjpuwS4G+Qp+yKEBT9mE5H476BJ32bISdbkutp0J ParldiGEtFq62lKHo6B1ErRfdpVzgz9ehQqWPYYX4KunelWJ+e5/NIAyAdBhN4nIM/ml SzvVYb31cwqkqWXUNc949+Ix7UGtcSqCDQRR2OnEu9EvNnPw0+8+0O/ETcYpJfFP4xtD pwOQk5TA56BZLvQWDktYG1XluoiSFrKTRS3MmqxqNe8NUsZA7Xx1Q0rGvLLnADBFEUD5 aXCJdX5Kj9dJtULylEH96TBAC3AUaLNXbIO+Vnzh2dfuucjM4WsOz0iGC/xZeknNIrtw ACGw== X-Gm-Message-State: AC+VfDyP/Qn2Nzq/izo15eBmLnt5WMSRI+Enwmn+doZTEWiSAlGWYy/z d5kh5t6kid3gBe3rgTBxom5GmJr+3Xo1yKIJvS0= X-Google-Smtp-Source: ACHHUZ49ZLV7xi+zSkFfNuL2kLW/MKRO0WSp4mAN8lvKxF7uzs4gL6RwWuKrC5iLX+Lkl9MvMMn7FUz/rVxIGIZ1ZeQ= X-Received: by 2002:a4a:de82:0:b0:55c:6812:27c5 with SMTP id v2-20020a4ade82000000b0055c681227c5mr5911131oou.9.1687127686569; Sun, 18 Jun 2023 15:34:46 -0700 (PDT) In-Reply-To: <87a5ww7qa3.fsf@gmail.com> 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:263664 Archived-At: On Sun, Jun 18, 2023 at 4:15=E2=80=AFPM Jo=C3=A3o T=C3=A1vora wrote: > > Philip Kaludercic writes: > > > Jo=C3=A3o, do you have anything to add to this discussion? > > Yes, a bit. > > To the "should it use diff" objection, I think it's OK to keep it as is. > Especially if we frame this new 'diff' value to Eglot's > eglot-confirm-server-initiated-edits as a "Present changes as 'diff', > and user takes it from there". I'd say most programmers can read diffs > and apply them by hand if required. After thinking a bit, I realized I missed a point of Eli's objection to the implementation of this. It's that the 'diff' program is required just to generate the presentation, not just to apply it. But I don't see any other better ways to summarily present changes to files. Ediff maybe? But that's not so good, and it requires splitting the window and entering a transient mode. And I'm not sure it doesn't rely on the diff program itself (but haven't checked). Anyway, who works with Emacs in a programming context -- which is what LSP is mainly for -- that also doesn't have the diff program for patches, vc-diff, etc? Jo=C3=A3o