From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#60338: [PATCH] Add option to present server changes as diffs Date: Thu, 07 Sep 2023 09:28:31 +0300 Organization: LINKOV.NET Message-ID: <868r9io6lo.fsf@mail.linkov.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> <87sf7w526r.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="9241"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) Cc: Philip Kaludercic , 60338@debbugs.gnu.org, Eshel Yaron , =?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?= , Eli Zaretskii To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Sep 07 08:34:28 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 1qe8ay-0002GJ-S0 for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 07 Sep 2023 08:34:28 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qe8aZ-0007Ro-6c; Thu, 07 Sep 2023 02:34:03 -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 1qe8aY-0007RZ-Ap for bug-gnu-emacs@gnu.org; Thu, 07 Sep 2023 02:34:02 -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 1qe8aX-00089S-Vp for bug-gnu-emacs@gnu.org; Thu, 07 Sep 2023 02:34:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qe8aY-0005CP-D9 for bug-gnu-emacs@gnu.org; Thu, 07 Sep 2023 02:34:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 07 Sep 2023 06:34: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.169406841919944 (code B ref 60338); Thu, 07 Sep 2023 06:34:02 +0000 Original-Received: (at 60338) by debbugs.gnu.org; 7 Sep 2023 06:33:39 +0000 Original-Received: from localhost ([127.0.0.1]:38374 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qe8aA-0005Bc-QU for submit@debbugs.gnu.org; Thu, 07 Sep 2023 02:33:39 -0400 Original-Received: from relay8-d.mail.gandi.net ([2001:4b98:dc4:8::228]:57629) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qe8a7-0005BJ-OI for 60338@debbugs.gnu.org; Thu, 07 Sep 2023 02:33:37 -0400 Original-Received: by mail.gandi.net (Postfix) with ESMTPSA id 4F42A1BF20D; Thu, 7 Sep 2023 06:33:25 +0000 (UTC) In-Reply-To: (Dmitry Gutov's message of "Thu, 7 Sep 2023 04:00:33 +0300") X-GND-Sasl: juri@linkov.net 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:269607 Archived-At: > Two other thoughts after trying it: > > - I would probably want to bind the originally proposed > 'diff-apply-everything' to 'C-c C-c' (e.g. "commit the change to disk"), > but that's already taken in diff-mode. If there are no more intuitive keys, maybe then use the proposed by Philip 'C-c C-x'? > - 'git diff' has a less-frequently used option called '--word-diff' which > could reduce the length of the diff in the case I am testing (but I guess > diff-mode would have to be updated to support that output). And another > way in that direction would be to reduce the size of the diff context > (e.g. to 0). Whereas the output of '--word-diff' is closer to VS Code, but it's hard to read for anyone accustomed to the diff unified format ;-) BTW, it looks '--word-diff' could help Samuel in bug#61396?