From: Dmitry Gutov <dmitry@gutov.dev>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 65049@debbugs.gnu.org, habamax@gmail.com, juri@linkov.net
Subject: bug#65049: Minor update to the repro steps
Date: Fri, 25 Aug 2023 00:44:58 +0300 [thread overview]
Message-ID: <2f6986e7-f96b-98bd-4581-7503bb01b111@gutov.dev> (raw)
In-Reply-To: <789dacd3-8e62-74ad-f691-5b48cb1d678b@gutov.dev>
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'.
next prev parent reply other threads:[~2023-08-24 21:44 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-04 7:50 bug#65049: 29.1; vc-do-command fails in windows emacs 29.1 Maxim Kim
2023-08-04 8:02 ` bug#65049: Minor update to the repro steps Maxim Kim
2023-08-04 11:05 ` Eli Zaretskii
2023-08-04 11:24 ` Maxim Kim
2023-08-04 17:56 ` Juri Linkov
2023-08-06 23:04 ` Maxim Kim
2023-08-07 1:09 ` Maxim Kim
2023-08-07 16:24 ` Eli Zaretskii
2023-08-07 23:17 ` Maxim Kim
2023-08-20 16:49 ` Juri Linkov
2023-08-20 18:25 ` Eli Zaretskii
2023-08-21 6:53 ` Juri Linkov
2023-08-21 11:00 ` Eli Zaretskii
2023-08-21 11:39 ` Maxim Kim
2023-08-21 12:18 ` Eli Zaretskii
2023-08-21 23:10 ` Maxim Kim
2023-08-22 12:52 ` Eli Zaretskii
2023-08-22 13:12 ` Maxim Kim
2023-08-22 13:17 ` Eli Zaretskii
2023-08-22 23:43 ` Maxim Kim
2023-08-23 4:28 ` Maxim Kim
2023-08-23 16:21 ` Eli Zaretskii
2023-08-23 17:42 ` Juri Linkov
2023-08-23 18:43 ` Eli Zaretskii
2023-08-23 20:13 ` Dmitry Gutov
2023-08-24 4:54 ` Eli Zaretskii
2023-08-24 21:06 ` Dmitry Gutov
2023-08-24 21:35 ` Dmitry Gutov
2023-08-24 21:44 ` Dmitry Gutov [this message]
2023-08-25 6:18 ` Eli Zaretskii
2023-08-26 0:45 ` Dmitry Gutov
2023-08-26 8:50 ` Eli Zaretskii
2023-08-27 1:14 ` Dmitry Gutov
2023-08-27 5:36 ` Eli Zaretskii
2023-08-27 22:32 ` Dmitry Gutov
2023-08-28 12:12 ` Eli Zaretskii
2023-08-28 13:45 ` Dmitry Gutov
2023-08-28 16:12 ` Eli Zaretskii
2023-08-28 16:51 ` Dmitry Gutov
2023-08-28 16:57 ` Eli Zaretskii
2023-08-28 17:39 ` Dmitry Gutov
2023-08-28 18:26 ` Eli Zaretskii
2023-08-31 2:07 ` Richard Stallman
2023-08-31 2:14 ` Dmitry Gutov
2023-08-31 6:00 ` Eli Zaretskii
2023-08-23 23:46 ` Maxim Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2f6986e7-f96b-98bd-4581-7503bb01b111@gutov.dev \
--to=dmitry@gutov.dev \
--cc=65049@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=habamax@gmail.com \
--cc=juri@linkov.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.