GNU bug report logs - #44617
26.3; diff-mode ignores diff-switches

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 44617 in the body.
You can then email your comments to 44617 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Francesco Potortì <pot <at> gnu.org>
To: bug-gnu-emacs <at> gnu.org
Subject: 26.3; diff-mode ignores diff-switches
Date: Fri, 13 Nov 2020 13:11:44 +0100

In GNU Emacs 26.3 (build 1, x86_64-pc-linux-gnu, X toolkit, Xaw3d scroll bars)
 of 2020-05-17, modified by Debian built on x86-csail-01

diff-mode relies on the diff-command variables defined in diff.el, but
ignores diff-switches

I think this is a bug

Message #8 received at 44617 <at> debbugs.gnu.org (full text, mbox):

From: Daniel Martín <mardani29 <at> yahoo.es>
To: Francesco Potortì <pot <at> gnu.org>
Cc: 44617 <at> debbugs.gnu.org
Subject: Re: bug#44617: 26.3; diff-mode ignores diff-switches
Date: Fri, 13 Nov 2020 17:11:29 +0100

Francesco Potortì <pot <at> gnu.org> writes:

> In GNU Emacs 26.3 (build 1, x86_64-pc-linux-gnu, X toolkit, Xaw3d scroll bars)
>  of 2020-05-17, modified by Debian built on x86-csail-01
>
> diff-mode relies on the diff-command variables defined in diff.el, but
> ignores diff-switches
>
> I think this is a bug

I have checked Emacs 26.3 and Emacs 27.1 and I can't reproduce this bug.
Do you have a more detailed recipe to reproduce the problem starting
from emacs -Q?  Thanks.

Message #11 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Daniel Martín <mardani29 <at> yahoo.es>
To: Daniel Mart?n via "Bug reports for GNU Emacs, the Swiss army knife of
 text editors" <bug-gnu-emacs <at> gnu.org>
Cc: 44617 <at> debbugs.gnu.org, Francesco Potortì <pot <at> gnu.org>
Subject: Re: bug#44617: 26.3; diff-mode ignores diff-switches
Date: Fri, 13 Nov 2020 17:31:23 +0100

Daniel Martín via "Bug reports for GNU Emacs, the Swiss army knife of
text editors" <bug-gnu-emacs <at> gnu.org> writes:
>
> I have checked Emacs 26.3 and Emacs 27.1 and I can't reproduce this bug.
> Do you have a more detailed recipe to reproduce the problem starting
> from emacs -Q?  Thanks.

Never mind, I assumed you were talking about the diff command.  You are
right, diff-mode doesn't use the diff-switches variable.

Message #17 received at 44617 <at> debbugs.gnu.org (full text, mbox):

From: Lars Ingebrigtsen <larsi <at> gnus.org>
To: Francesco Potortì <pot <at> gnu.org>
Cc: 44617 <at> debbugs.gnu.org
Subject: Re: bug#44617: 26.3; diff-mode ignores diff-switches
Date: Sat, 14 Nov 2020 17:25:17 +0100

Francesco Potortì <pot <at> gnu.org> writes:

> diff-mode relies on the diff-command variables defined in diff.el, but
> ignores diff-switches
>
> I think this is a bug

Do you mean the `diff-refresh-hunk' command?  I does indeed ignore
`diff-switches', but that's because it tries to keep the style of the
diff consistent:

(defun diff-refresh-hunk (&optional ignore-whitespace)
  "Re-diff the current hunk."
  (interactive)
  (let* ((char-offset (- (point) (diff-beginning-of-hunk t)))
	 (opt-type (pcase (char-after)
                     (?@ "-u")
                     (?* "-c")))

Which I think sounds like the correct design.  What's the use case you
have for diff-switches where you'd want this command to heed diff-switches?

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Message #20 received at 44617 <at> debbugs.gnu.org (full text, mbox):

From: Francesco Potortì <pot <at> gnu.org>
To: Lars Ingebrigtsen <larsi <at> gnus.org>
Cc: 44617 <at> debbugs.gnu.org
Subject: Re: bug#44617: 26.3; diff-mode ignores diff-switches
Date: Sat, 05 Dec 2020 22:05:19 +0100

>> diff-mode relies on the diff-command variables defined in diff.el, but
>> ignores diff-switches
>>
>> I think this is a bug
>
>Do you mean the `diff-refresh-hunk' command?

No, it's a different issue.

>What's the use case you have for diff-switches where you'd want this
>command to heed diff-switches?

I have two use cases.

1) When using dired-diff (hit = in a dired buffer) diff-switches is not used.

2) Same is when using vc-diff (C-x v =) in a VC buffer.

Apparently case 2) is a bug, because the docs of vc-diff-switches says
that diff-switches should be used.  Case 1) could simply be unexpected
behaviour.

Message #23 received at 44617 <at> debbugs.gnu.org (full text, mbox):

From: Lars Ingebrigtsen <larsi <at> gnus.org>
To: Francesco Potortì <pot <at> gnu.org>
Cc: 44617 <at> debbugs.gnu.org
Subject: Re: bug#44617: 26.3; diff-mode ignores diff-switches
Date: Sun, 06 Dec 2020 14:51:08 +0100

Francesco Potortì <pot <at> gnu.org> writes:

>>What's the use case you have for diff-switches where you'd want this
>>command to heed diff-switches?
>
> I have two use cases.
>
> 1) When using dired-diff (hit = in a dired buffer) diff-switches is not used.
>
> 2) Same is when using vc-diff (C-x v =) in a VC buffer.
>
> Apparently case 2) is a bug, because the docs of vc-diff-switches says
> that diff-switches should be used.  Case 1) could simply be unexpected
> behaviour.

I 1), diff-switches is always used, so I can't reproduce that problem at
all -- changing diff-switches and using the `=' command reflects the
changed switches.  Do you have that command rebound, by any chance?

As for 2), `diff-switches' is indeed used, but only when `vc-diff-switches'
is nil, as the doc string says:

--
When running diff under a given BACKEND, VC uses the first
non-nil value of ‘vc-BACKEND-diff-switches’, ‘vc-diff-switches’,
and ‘diff-switches’, in that order. 
--

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Message #28 received at 44617 <at> debbugs.gnu.org (full text, mbox):

From: Francesco Potortì <pot <at> gnu.org>
To: Lars Ingebrigtsen <larsi <at> gnus.org>
Cc: 44617 <at> debbugs.gnu.org
Subject: Re: bug#44617: 26.3; diff-mode ignores diff-switches
Date: Mon, 07 Dec 2020 00:39:48 +0100

Lars,

I rechecked everything and indeed I was wrong for both cases.  I am
sorry for the false alarm.

Please close this bug.

Message #31 received at 44617 <at> debbugs.gnu.org (full text, mbox):

From: Lars Ingebrigtsen <larsi <at> gnus.org>
To: Francesco Potortì <pot <at> gnu.org>
Cc: 44617 <at> debbugs.gnu.org
Subject: Re: bug#44617: 26.3; diff-mode ignores diff-switches
Date: Mon, 07 Dec 2020 00:41:38 +0100

Francesco Potortì <pot <at> gnu.org> writes:

> I rechecked everything and indeed I was wrong for both cases.  I am
> sorry for the false alarm.

No problem.  :-)

> Please close this bug.

Done.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.