GNU bug report logs -
#65049
29.1; vc-do-command fails in windows emacs 29.1
Previous Next
Reported by: Maxim Kim <habamax <at> gmail.com>
Date: Fri, 4 Aug 2023 07:51:01 UTC
Severity: normal
Found in version 29.1
Done: Dmitry Gutov <dmitry <at> gutov.dev>
Bug is archived. No further changes may be made.
Full log
Message #95 received at 65049 <at> debbugs.gnu.org (full text, mbox):
On 25/08/2023 00:35, Dmitry Gutov wrote:
> On 25/08/2023 00:06, Dmitry Gutov wrote:
>>
>>> But before I do, could you
>>> please try the recipe here:
>>>
>>> https://debbugs.gnu.org/cgi/bugreport.cgi?bug=65049#68
>>>
>>> but with the following change in step 4:
>>>
>>> 4. C-x RET f utf-8-dos RET
>>>
>>> That is, try the recipe on a Posix host with a file whose EOL format
>>> is CRLF. If that works without any changes in the current VC code, I
>>> will be happy to make the first hunk Windows-specific.
>>
>> That works with the current emacs-29. Also tried with the patch
>> applied -- still works.
>
> But here's a modification of the scenario that fails (again: both with
> and without the patch): replace step 9 with
>
> 9. C-x v =
>
> The non-root diff looks a little different to begin with: it doesn't
> show those ^M chars at the end of lines (whereas the result of
> vc-root-diff shows them). That is likely the reason: buffer set up in a
> different way.
Looks like it's this line:
(coding-system-for-read
(if files (vc-coding-system-for-diff (car files)) 'undecided))
near the beginning of vc-diff-internal that creates the difference.
Commenting it out makes the scenario work with both 'C-x v =' and 'C-x v D'.
This bug report was last modified 232 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.