* bug#68377: Cannot commit parts of *vc-diff* on Microsoft Windows
@ 2024-01-11 2:07 Sam Steingold
2024-01-11 12:28 ` Eli Zaretskii
0 siblings, 1 reply; 11+ messages in thread
From: Sam Steingold @ 2024-01-11 2:07 UTC (permalink / raw)
To: 68377
https://emacs.stackexchange.com/q/80039/795
Emacs has a beautiful feature: in the `*vc-diff*` buffer (generated by [`vc-diff`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Old-Revisions.html) either by <kbd>C-x v =</kbd> in a file buffer or by <kbd>=</kbd> in a `*vc-dir*` buffer), kill unwanted hunks with <kbd>k</kbd> (i.e., [`diff-hunk-kill`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Diff-Mode.html)) and then commit the remaining hunks with <kbd>C-x v v</kbd> (i.e., [`vc-next-action`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Basic-VC-Editing.html)). If you don't know about it -- try it, it is incredibly useful!
Alas, it does _not_ work for me on windows: after <kbd>C-c C-c</kbd> (i.e., [`log-edit-done`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Log-Buffer.html)) in `*vc-log*`, I get
> vc-do-command: Failed (status 1): c:/Users/ssteingold/AppData/Local/Git/bin/git.exe --no-pager apply --cached c:/msys64/tmp/git-patchPbbWgJ
and `*vc*` buffer is
```
error: patch failed: fxpy/model.py:1071
error: fxpy/model.py: patch does not apply
```
***Additionally***:
1. Software:
* [`GNU Emacs 29.1 (build 2, x86_64-w64-mingw32) of 2023-08-02`](https://ftp.gnu.org/gnu/emacs/windows/emacs-29/)
* [`git version 2.42.0.windows.2`](https://gitforwindows.org/)
1. *normal* commits work just **fine**, using `vc-next-action` from either file buffer or `*vc-dir*`.
1. All my files have unix line terminators (`LF`) as indicated in the mode line as `(Unix)`
1. I set `autocrlf` to `false` globally
1. I have `(prefer-coding-system 'utf-8-unix)` in `.emacs`
1. `vc-coding-system-inherit-eol` is `t`, I did not touch it
1. When I add `"-v"` to `git apply` invocation in `vc-git-checkin` (`vc-git.el`), `*vc*` buffer contains `error: while searching for:.....` and every line in `.....` is terminated with `?` - which seems to indicate line-ending problems... (!!!)
***Q***: how do I fix this?
(This is a work box, I cannot send email from Emacs, so I cannot even file an Emacs bug report!)
# work-around 1
Add
```
(setq coding-system-for-write 'utf-8-unix)
```
inside `(with-temp-file patch-file ...)` in `vc-git-checkin`
# work-around 2
Add
```
;; replace `undecided`:
(setf (cadr (assoc "" file-coding-system-alist)) 'utf-8-unix)
```
to `.emacs`
# Emacs bug
`vc-git-checkin` should respect `vc-coding-system-inherit-eol` and set [`coding-system-for-write`](https://www.gnu.org/software/emacs/manual/html_node/elisp/Specifying-Coding-Systems.html) when writing the patch.
Also, it does not seem reasonable that [`prefer-coding-system`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Output-Coding.html) does not affect [`file-coding-system-alist`](https://www.gnu.org/software/emacs/manual/html_node/elisp/Default-Coding-Systems.html).
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#68377: Cannot commit parts of *vc-diff* on Microsoft Windows
2024-01-11 2:07 bug#68377: Cannot commit parts of *vc-diff* on Microsoft Windows Sam Steingold
@ 2024-01-11 12:28 ` Eli Zaretskii
2024-01-11 12:44 ` Eli Zaretskii
2024-01-11 13:19 ` Dmitry Gutov
0 siblings, 2 replies; 11+ messages in thread
From: Eli Zaretskii @ 2024-01-11 12:28 UTC (permalink / raw)
To: sds; +Cc: 68377
> From: Sam Steingold <sds@gnu.org>
> Date: Wed, 10 Jan 2024 21:07:14 -0500
>
> https://emacs.stackexchange.com/q/80039/795
>
> Emacs has a beautiful feature: in the `*vc-diff*` buffer (generated by [`vc-diff`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Old-Revisions.html) either by <kbd>C-x v =</kbd> in a file buffer or by <kbd>=</kbd> in a `*vc-dir*` buffer), kill unwanted hunks with <kbd>k</kbd> (i.e., [`diff-hunk-kill`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Diff-Mode.html)) and then commit the remaining hunks with <kbd>C-x v v</kbd> (i.e., [`vc-next-action`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Basic-VC-Editing.html)). If you don't know about it -- try it, it is incredibly useful!
(I must say that formatting of this report is AWFUL! How can a human
being be expected to read and understand it it?? PLEASE try to make
bug reports more readable in the future.)
> Alas, it does _not_ work for me on windows: after <kbd>C-c C-c</kbd> (i.e., [`log-edit-done`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Log-Buffer.html)) in `*vc-log*`, I get
> > vc-do-command: Failed (status 1): c:/Users/ssteingold/AppData/Local/Git/bin/git.exe --no-pager apply --cached c:/msys64/tmp/git-patchPbbWgJ
>
> and `*vc*` buffer is
> ```
> error: patch failed: fxpy/model.py:1071
> error: fxpy/model.py: patch does not apply
> ```
>
> ***Additionally***:
>
> 1. Software:
> * [`GNU Emacs 29.1 (build 2, x86_64-w64-mingw32) of 2023-08-02`](https://ftp.gnu.org/gnu/emacs/windows/emacs-29/)
> * [`git version 2.42.0.windows.2`](https://gitforwindows.org/)
> 1. *normal* commits work just **fine**, using `vc-next-action` from either file buffer or `*vc-dir*`.
> 1. All my files have unix line terminators (`LF`) as indicated in the mode line as `(Unix)`
> 1. I set `autocrlf` to `false` globally
> 1. I have `(prefer-coding-system 'utf-8-unix)` in `.emacs`
> 1. `vc-coding-system-inherit-eol` is `t`, I did not touch it
> 1. When I add `"-v"` to `git apply` invocation in `vc-git-checkin` (`vc-git.el`), `*vc*` buffer contains `error: while searching for:.....` and every line in `.....` is terminated with `?` - which seems to indicate line-ending problems... (!!!)
>
> ***Q***: how do I fix this?
> (This is a work box, I cannot send email from Emacs, so I cannot even file an Emacs bug report!)
>
> # work-around 1
>
> Add
> ```
> (setq coding-system-for-write 'utf-8-unix)
> ```
> inside `(with-temp-file patch-file ...)` in `vc-git-checkin`
The code in question already does:
(let ((patch-file (make-nearby-temp-file "git-patch"))
;; Temporarily countermand the let-binding at the
;; beginning of this function.
(coding-system-for-write
(coding-system-change-eol-conversion
;; On DOS/Windows, it is important for the patch file
;; to have the Unix EOL format, because Git expects
;; that, even on Windows.
(or pcsw vc-git-commits-coding-system) 'unix)))
(with-temp-file patch-file
(insert vc-git-patch-string))
So coding-system-for-write should already be -unix when with-temp-file
runs. I guess there's more here than meets the eye, or maybe I'm
missing something.
> # work-around 2
>
> Add
> ```
> ;; replace `undecided`:
> (setf (cadr (assoc "" file-coding-system-alist)) 'utf-8-unix)
> ```
> to `.emacs`
That can't be right.
> # Emacs bug
>
> `vc-git-checkin` should respect `vc-coding-system-inherit-eol` and set [`coding-system-for-write`](https://www.gnu.org/software/emacs/manual/html_node/elisp/Specifying-Coding-Systems.html) when writing the patch.
This variable is for _reading_ diffs from a VC command, not about
_writing_ them. So it is not appropriate in this case, and the diffs
shown in the *vc-diff* buffer have correct EOLs.
> Also, it does not seem reasonable that [`prefer-coding-system`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Output-Coding.html) does not affect [`file-coding-system-alist`](https://www.gnu.org/software/emacs/manual/html_node/elisp/Default-Coding-Systems.html).
Using prefer-coding-system to make utf-8 the preferred encoding is
wrong on MS-Windows in the first place: UTF-8 is not yet supported by
Windows well enough to allow that. In particular, encoding program
arguments in UTF-8 will cause failures in Emacs commands that run
subprocesses.
^ permalink raw reply [flat|nested] 11+ messages in thread* bug#68377: Cannot commit parts of *vc-diff* on Microsoft Windows
2024-01-11 12:28 ` Eli Zaretskii
@ 2024-01-11 12:44 ` Eli Zaretskii
2024-01-11 12:54 ` Eli Zaretskii
2024-01-11 13:19 ` Dmitry Gutov
1 sibling, 1 reply; 11+ messages in thread
From: Eli Zaretskii @ 2024-01-11 12:44 UTC (permalink / raw)
To: sds; +Cc: 68377
> Cc: 68377@debbugs.gnu.org
> Date: Thu, 11 Jan 2024 14:28:49 +0200
> From: Eli Zaretskii <eliz@gnu.org>
>
> > # work-around 1
> >
> > Add
> > ```
> > (setq coding-system-for-write 'utf-8-unix)
> > ```
> > inside `(with-temp-file patch-file ...)` in `vc-git-checkin`
>
> The code in question already does:
>
> (let ((patch-file (make-nearby-temp-file "git-patch"))
> ;; Temporarily countermand the let-binding at the
> ;; beginning of this function.
> (coding-system-for-write
> (coding-system-change-eol-conversion
> ;; On DOS/Windows, it is important for the patch file
> ;; to have the Unix EOL format, because Git expects
> ;; that, even on Windows.
> (or pcsw vc-git-commits-coding-system) 'unix)))
> (with-temp-file patch-file
> (insert vc-git-patch-string))
>
> So coding-system-for-write should already be -unix when with-temp-file
> runs. I guess there's more here than meets the eye, or maybe I'm
> missing something.
And sure enough, trying the recipe from "emacs -Q" fails to reproduce
the problem. So there's something else at work here.
Could you please try this in "emacs -Q"? If it doesn't work in
"emacs -Q", please step in Edebug through vc-git-checkin and tell
what you see as the value of coding-system-for-write when this code
is executed:
(with-temp-file patch-file
(insert vc-git-patch-string))
and also what is the EOL format of patch-file that Emacs creates
there, and let's take it from there.
If this does work in "emacs -Q", then some of your customizations
related to coding-systems probably get in the way.
FTR, in my case autocrlf is also false (as it should be).
^ permalink raw reply [flat|nested] 11+ messages in thread* bug#68377: Cannot commit parts of *vc-diff* on Microsoft Windows
2024-01-11 12:44 ` Eli Zaretskii
@ 2024-01-11 12:54 ` Eli Zaretskii
0 siblings, 0 replies; 11+ messages in thread
From: Eli Zaretskii @ 2024-01-11 12:54 UTC (permalink / raw)
To: sds; +Cc: 68377
> Cc: 68377@debbugs.gnu.org
> Date: Thu, 11 Jan 2024 14:44:41 +0200
> From: Eli Zaretskii <eliz@gnu.org>
>
> FTR, in my case autocrlf is also false (as it should be).
Btw, I tested in the master-branch version, so please begin by testing
"emacs -Q" on master, not the Emacs 29.1 version. If the master
version works in "emacs -Q", then try the same with Emacs 29.1.
Thanks.
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#68377: Cannot commit parts of *vc-diff* on Microsoft Windows
2024-01-11 12:28 ` Eli Zaretskii
2024-01-11 12:44 ` Eli Zaretskii
@ 2024-01-11 13:19 ` Dmitry Gutov
2024-01-11 14:47 ` Eli Zaretskii
1 sibling, 1 reply; 11+ messages in thread
From: Dmitry Gutov @ 2024-01-11 13:19 UTC (permalink / raw)
To: Eli Zaretskii, sds; +Cc: 68377
On 11/01/2024 14:28, Eli Zaretskii wrote:
>> From: Sam Steingold <sds@gnu.org>
>> Date: Wed, 10 Jan 2024 21:07:14 -0500
>>
>> https://emacs.stackexchange.com/q/80039/795
>>
>> Emacs has a beautiful feature: in the `*vc-diff*` buffer (generated by [`vc-diff`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Old-Revisions.html) either by <kbd>C-x v =</kbd> in a file buffer or by <kbd>=</kbd> in a `*vc-dir*` buffer), kill unwanted hunks with <kbd>k</kbd> (i.e., [`diff-hunk-kill`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Diff-Mode.html)) and then commit the remaining hunks with <kbd>C-x v v</kbd> (i.e., [`vc-next-action`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Basic-VC-Editing.html)). If you don't know about it -- try it, it is incredibly useful!
>
> (I must say that formatting of this report is AWFUL! How can a human
> being be expected to read and understand it it?? PLEASE try to make
> bug reports more readable in the future.)
Looked fine to me.
I think the Markdown format is very readable.
>> Alas, it does _not_ work for me on windows: after <kbd>C-c C-c</kbd> (i.e., [`log-edit-done`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Log-Buffer.html)) in `*vc-log*`, I get
>>> vc-do-command: Failed (status 1): c:/Users/ssteingold/AppData/Local/Git/bin/git.exe --no-pager apply --cached c:/msys64/tmp/git-patchPbbWgJ
>>
>> and `*vc*` buffer is
>> ```
>> error: patch failed: fxpy/model.py:1071
>> error: fxpy/model.py: patch does not apply
>> ```
>>
>> ***Additionally***:
>>
>> 1. Software:
>> * [`GNU Emacs 29.1 (build 2, x86_64-w64-mingw32) of 2023-08-02`](https://ftp.gnu.org/gnu/emacs/windows/emacs-29/)
>> * [`git version 2.42.0.windows.2`](https://gitforwindows.org/)
>> 1. *normal* commits work just **fine**, using `vc-next-action` from either file buffer or `*vc-dir*`.
>> 1. All my files have unix line terminators (`LF`) as indicated in the mode line as `(Unix)`
>> 1. I set `autocrlf` to `false` globally
>> 1. I have `(prefer-coding-system 'utf-8-unix)` in `.emacs`
>> 1. `vc-coding-system-inherit-eol` is `t`, I did not touch it
>> 1. When I add `"-v"` to `git apply` invocation in `vc-git-checkin` (`vc-git.el`), `*vc*` buffer contains `error: while searching for:.....` and every line in `.....` is terminated with `?` - which seems to indicate line-ending problems... (!!!)
>>
>> ***Q***: how do I fix this?
>> (This is a work box, I cannot send email from Emacs, so I cannot even file an Emacs bug report!)
>>
>> # work-around 1
>>
>> Add
>> ```
>> (setq coding-system-for-write 'utf-8-unix)
>> ```
>> inside `(with-temp-file patch-file ...)` in `vc-git-checkin`
>
> The code in question already does:
>
> (let ((patch-file (make-nearby-temp-file "git-patch"))
> ;; Temporarily countermand the let-binding at the
> ;; beginning of this function.
> (coding-system-for-write
> (coding-system-change-eol-conversion
> ;; On DOS/Windows, it is important for the patch file
> ;; to have the Unix EOL format, because Git expects
> ;; that, even on Windows.
> (or pcsw vc-git-commits-coding-system) 'unix)))
> (with-temp-file patch-file
> (insert vc-git-patch-string))
>
> So coding-system-for-write should already be -unix when with-temp-file
> runs. I guess there's more here than meets the eye, or maybe I'm
> missing something.
I think this is the same as bug#65049, meaning that it's fixed on
master, but not in Emacs 29.1 (which was the version specified in the
report).
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#68377: Cannot commit parts of *vc-diff* on Microsoft Windows
2024-01-11 13:19 ` Dmitry Gutov
@ 2024-01-11 14:47 ` Eli Zaretskii
2024-01-11 15:07 ` Dmitry Gutov
0 siblings, 1 reply; 11+ messages in thread
From: Eli Zaretskii @ 2024-01-11 14:47 UTC (permalink / raw)
To: Dmitry Gutov; +Cc: 68377, sds
> Date: Thu, 11 Jan 2024 15:19:26 +0200
> Cc: 68377@debbugs.gnu.org
> From: Dmitry Gutov <dmitry@gutov.dev>
>
> On 11/01/2024 14:28, Eli Zaretskii wrote:
> >> From: Sam Steingold <sds@gnu.org>
> >> Date: Wed, 10 Jan 2024 21:07:14 -0500
> >>
> >> https://emacs.stackexchange.com/q/80039/795
> >>
> >> Emacs has a beautiful feature: in the `*vc-diff*` buffer (generated by [`vc-diff`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Old-Revisions.html) either by <kbd>C-x v =</kbd> in a file buffer or by <kbd>=</kbd> in a `*vc-dir*` buffer), kill unwanted hunks with <kbd>k</kbd> (i.e., [`diff-hunk-kill`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Diff-Mode.html)) and then commit the remaining hunks with <kbd>C-x v v</kbd> (i.e., [`vc-next-action`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Basic-VC-Editing.html)). If you don't know about it -- try it, it is incredibly useful!
> >
> > (I must say that formatting of this report is AWFUL! How can a human
> > being be expected to read and understand it it?? PLEASE try to make
> > bug reports more readable in the future.)
>
> Looked fine to me.
>
> I think the Markdown format is very readable.
It isn't Markdown that bothered me, it's some kind of HTML mixed in,
but in an email message whose format is plain text (at least as I got
it here).
> I think this is the same as bug#65049, meaning that it's fixed on
> master, but not in Emacs 29.1 (which was the version specified in the
> report).
Possibly. If Sam says it works for him on master, we will know.
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#68377: Cannot commit parts of *vc-diff* on Microsoft Windows
2024-01-11 14:47 ` Eli Zaretskii
@ 2024-01-11 15:07 ` Dmitry Gutov
2024-01-14 16:42 ` Eli Zaretskii
0 siblings, 1 reply; 11+ messages in thread
From: Dmitry Gutov @ 2024-01-11 15:07 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: 68377, sds
On 11/01/2024 16:47, Eli Zaretskii wrote:
>> Date: Thu, 11 Jan 2024 15:19:26 +0200
>> Cc:68377@debbugs.gnu.org
>> From: Dmitry Gutov<dmitry@gutov.dev>
>>
>> On 11/01/2024 14:28, Eli Zaretskii wrote:
>>>> From: Sam Steingold<sds@gnu.org>
>>>> Date: Wed, 10 Jan 2024 21:07:14 -0500
>>>>
>>>> https://emacs.stackexchange.com/q/80039/795
>>>>
>>>> Emacs has a beautiful feature: in the `*vc-diff*` buffer (generated by [`vc-diff`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Old-Revisions.html) either by <kbd>C-x v =</kbd> in a file buffer or by <kbd>=</kbd> in a `*vc-dir*` buffer), kill unwanted hunks with <kbd>k</kbd> (i.e., [`diff-hunk-kill`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Diff-Mode.html)) and then commit the remaining hunks with <kbd>C-x v v</kbd> (i.e., [`vc-next-action`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Basic-VC-Editing.html)). If you don't know about it -- try it, it is incredibly useful!
>>> (I must say that formatting of this report is AWFUL! How can a human
>>> being be expected to read and understand it it?? PLEASE try to make
>>> bug reports more readable in the future.)
>> Looked fine to me.
>>
>> I think the Markdown format is very readable.
> It isn't Markdown that bothered me, it's some kind of HTML mixed in,
> but in an email message whose format is plain text (at least as I got
> it here).
The <kbd> tags? These are also supported by Markdown. The links too.
>> I think this is the same as bug#65049, meaning that it's fixed on
>> master, but not in Emacs 29.1 (which was the version specified in the
>> report).
> Possibly. If Sam says it works for him on master, we will know.
Yes, let's see what he says.
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#68377: Cannot commit parts of *vc-diff* on Microsoft Windows
2024-01-11 15:07 ` Dmitry Gutov
@ 2024-01-14 16:42 ` Eli Zaretskii
2024-01-27 9:11 ` Eli Zaretskii
0 siblings, 1 reply; 11+ messages in thread
From: Eli Zaretskii @ 2024-01-14 16:42 UTC (permalink / raw)
To: Dmitry Gutov; +Cc: 68377, sds
> Date: Thu, 11 Jan 2024 17:07:48 +0200
> From: Dmitry Gutov <dmitry@gutov.dev>
> Cc: 68377@debbugs.gnu.org, sds@gnu.org
>
> On 11/01/2024 16:47, Eli Zaretskii wrote:
> >> Date: Thu, 11 Jan 2024 15:19:26 +0200
> >> Cc:68377@debbugs.gnu.org
> >> From: Dmitry Gutov<dmitry@gutov.dev>
> >>
> >> On 11/01/2024 14:28, Eli Zaretskii wrote:
> >>>> From: Sam Steingold<sds@gnu.org>
> >>>> Date: Wed, 10 Jan 2024 21:07:14 -0500
> >>>>
> >>>> https://emacs.stackexchange.com/q/80039/795
> >>>>
> >>>> Emacs has a beautiful feature: in the `*vc-diff*` buffer (generated by [`vc-diff`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Old-Revisions.html) either by <kbd>C-x v =</kbd> in a file buffer or by <kbd>=</kbd> in a `*vc-dir*` buffer), kill unwanted hunks with <kbd>k</kbd> (i.e., [`diff-hunk-kill`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Diff-Mode.html)) and then commit the remaining hunks with <kbd>C-x v v</kbd> (i.e., [`vc-next-action`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Basic-VC-Editing.html)). If you don't know about it -- try it, it is incredibly useful!
> >>> (I must say that formatting of this report is AWFUL! How can a human
> >>> being be expected to read and understand it it?? PLEASE try to make
> >>> bug reports more readable in the future.)
> >> Looked fine to me.
> >>
> >> I think the Markdown format is very readable.
> > It isn't Markdown that bothered me, it's some kind of HTML mixed in,
> > but in an email message whose format is plain text (at least as I got
> > it here).
>
> The <kbd> tags? These are also supported by Markdown. The links too.
>
> >> I think this is the same as bug#65049, meaning that it's fixed on
> >> master, but not in Emacs 29.1 (which was the version specified in the
> >> report).
> > Possibly. If Sam says it works for him on master, we will know.
>
> Yes, let's see what he says.
Sam, could you please chime in after testing this in Emacs 30?
Thanks.
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#68377: Cannot commit parts of *vc-diff* on Microsoft Windows
2024-01-14 16:42 ` Eli Zaretskii
@ 2024-01-27 9:11 ` Eli Zaretskii
2024-02-10 8:06 ` Eli Zaretskii
0 siblings, 1 reply; 11+ messages in thread
From: Eli Zaretskii @ 2024-01-27 9:11 UTC (permalink / raw)
To: sds; +Cc: 68377, dmitry
Ping! Sam, would you please try this on the master branch?
> Cc: 68377@debbugs.gnu.org, sds@gnu.org
> Date: Sun, 14 Jan 2024 18:42:41 +0200
> From: Eli Zaretskii <eliz@gnu.org>
>
> > Date: Thu, 11 Jan 2024 17:07:48 +0200
> > From: Dmitry Gutov <dmitry@gutov.dev>
> > Cc: 68377@debbugs.gnu.org, sds@gnu.org
> >
> > On 11/01/2024 16:47, Eli Zaretskii wrote:
> > >> Date: Thu, 11 Jan 2024 15:19:26 +0200
> > >> Cc:68377@debbugs.gnu.org
> > >> From: Dmitry Gutov<dmitry@gutov.dev>
> > >>
> > >> On 11/01/2024 14:28, Eli Zaretskii wrote:
> > >>>> From: Sam Steingold<sds@gnu.org>
> > >>>> Date: Wed, 10 Jan 2024 21:07:14 -0500
> > >>>>
> > >>>> https://emacs.stackexchange.com/q/80039/795
> > >>>>
> > >>>> Emacs has a beautiful feature: in the `*vc-diff*` buffer (generated by [`vc-diff`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Old-Revisions.html) either by <kbd>C-x v =</kbd> in a file buffer or by <kbd>=</kbd> in a `*vc-dir*` buffer), kill unwanted hunks with <kbd>k</kbd> (i.e., [`diff-hunk-kill`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Diff-Mode.html)) and then commit the remaining hunks with <kbd>C-x v v</kbd> (i.e., [`vc-next-action`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Basic-VC-Editing.html)). If you don't know about it -- try it, it is incredibly useful!
> > >>> (I must say that formatting of this report is AWFUL! How can a human
> > >>> being be expected to read and understand it it?? PLEASE try to make
> > >>> bug reports more readable in the future.)
> > >> Looked fine to me.
> > >>
> > >> I think the Markdown format is very readable.
> > > It isn't Markdown that bothered me, it's some kind of HTML mixed in,
> > > but in an email message whose format is plain text (at least as I got
> > > it here).
> >
> > The <kbd> tags? These are also supported by Markdown. The links too.
> >
> > >> I think this is the same as bug#65049, meaning that it's fixed on
> > >> master, but not in Emacs 29.1 (which was the version specified in the
> > >> report).
> > > Possibly. If Sam says it works for him on master, we will know.
> >
> > Yes, let's see what he says.
>
> Sam, could you please chime in after testing this in Emacs 30?
>
> Thanks.
>
>
>
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#68377: Cannot commit parts of *vc-diff* on Microsoft Windows
2024-01-27 9:11 ` Eli Zaretskii
@ 2024-02-10 8:06 ` Eli Zaretskii
2024-02-10 11:44 ` Dmitry Gutov
0 siblings, 1 reply; 11+ messages in thread
From: Eli Zaretskii @ 2024-02-10 8:06 UTC (permalink / raw)
To: sds; +Cc: 68377-done, dmitry
> Cc: 68377@debbugs.gnu.org, dmitry@gutov.dev
> Date: Sat, 27 Jan 2024 11:11:24 +0200
> From: Eli Zaretskii <eliz@gnu.org>
>
> Ping! Sam, would you please try this on the master branch?
>
> > Cc: 68377@debbugs.gnu.org, sds@gnu.org
> > Date: Sun, 14 Jan 2024 18:42:41 +0200
> > From: Eli Zaretskii <eliz@gnu.org>
> >
> > > Date: Thu, 11 Jan 2024 17:07:48 +0200
> > > From: Dmitry Gutov <dmitry@gutov.dev>
> > > Cc: 68377@debbugs.gnu.org, sds@gnu.org
> > >
> > > On 11/01/2024 16:47, Eli Zaretskii wrote:
> > > >> Date: Thu, 11 Jan 2024 15:19:26 +0200
> > > >> Cc:68377@debbugs.gnu.org
> > > >> From: Dmitry Gutov<dmitry@gutov.dev>
> > > >>
> > > >> On 11/01/2024 14:28, Eli Zaretskii wrote:
> > > >>>> From: Sam Steingold<sds@gnu.org>
> > > >>>> Date: Wed, 10 Jan 2024 21:07:14 -0500
> > > >>>>
> > > >>>> https://emacs.stackexchange.com/q/80039/795
> > > >>>>
> > > >>>> Emacs has a beautiful feature: in the `*vc-diff*` buffer (generated by [`vc-diff`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Old-Revisions.html) either by <kbd>C-x v =</kbd> in a file buffer or by <kbd>=</kbd> in a `*vc-dir*` buffer), kill unwanted hunks with <kbd>k</kbd> (i.e., [`diff-hunk-kill`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Diff-Mode.html)) and then commit the remaining hunks with <kbd>C-x v v</kbd> (i.e., [`vc-next-action`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Basic-VC-Editing.html)). If you don't know about it -- try it, it is incredibly useful!
> > > >>> (I must say that formatting of this report is AWFUL! How can a human
> > > >>> being be expected to read and understand it it?? PLEASE try to make
> > > >>> bug reports more readable in the future.)
> > > >> Looked fine to me.
> > > >>
> > > >> I think the Markdown format is very readable.
> > > > It isn't Markdown that bothered me, it's some kind of HTML mixed in,
> > > > but in an email message whose format is plain text (at least as I got
> > > > it here).
> > >
> > > The <kbd> tags? These are also supported by Markdown. The links too.
> > >
> > > >> I think this is the same as bug#65049, meaning that it's fixed on
> > > >> master, but not in Emacs 29.1 (which was the version specified in the
> > > >> report).
> > > > Possibly. If Sam says it works for him on master, we will know.
> > >
> > > Yes, let's see what he says.
> >
> > Sam, could you please chime in after testing this in Emacs 30?
> >
> > Thanks.
No further comments within a month, so I presume the bug is indeed
fixed on master, and I'm therefore closing it.
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#68377: Cannot commit parts of *vc-diff* on Microsoft Windows
2024-02-10 8:06 ` Eli Zaretskii
@ 2024-02-10 11:44 ` Dmitry Gutov
0 siblings, 0 replies; 11+ messages in thread
From: Dmitry Gutov @ 2024-02-10 11:44 UTC (permalink / raw)
To: Eli Zaretskii, sds; +Cc: 68377-done
On 10/02/2024 10:06, Eli Zaretskii wrote:
>> Cc: 68377@debbugs.gnu.org, dmitry@gutov.dev
>> Date: Sat, 27 Jan 2024 11:11:24 +0200
>> From: Eli Zaretskii <eliz@gnu.org>
>>
>> Ping! Sam, would you please try this on the master branch?
>>
>>> Cc: 68377@debbugs.gnu.org, sds@gnu.org
>>> Date: Sun, 14 Jan 2024 18:42:41 +0200
>>> From: Eli Zaretskii <eliz@gnu.org>
>>>
>>>> Date: Thu, 11 Jan 2024 17:07:48 +0200
>>>> From: Dmitry Gutov <dmitry@gutov.dev>
>>>> Cc: 68377@debbugs.gnu.org, sds@gnu.org
>>>>
>>>> On 11/01/2024 16:47, Eli Zaretskii wrote:
>>>>>> Date: Thu, 11 Jan 2024 15:19:26 +0200
>>>>>> Cc:68377@debbugs.gnu.org
>>>>>> From: Dmitry Gutov<dmitry@gutov.dev>
>>>>>>
>>>>>> On 11/01/2024 14:28, Eli Zaretskii wrote:
>>>>>>>> From: Sam Steingold<sds@gnu.org>
>>>>>>>> Date: Wed, 10 Jan 2024 21:07:14 -0500
>>>>>>>>
>>>>>>>> https://emacs.stackexchange.com/q/80039/795
>>>>>>>>
>>>>>>>> Emacs has a beautiful feature: in the `*vc-diff*` buffer (generated by [`vc-diff`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Old-Revisions.html) either by <kbd>C-x v =</kbd> in a file buffer or by <kbd>=</kbd> in a `*vc-dir*` buffer), kill unwanted hunks with <kbd>k</kbd> (i.e., [`diff-hunk-kill`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Diff-Mode.html)) and then commit the remaining hunks with <kbd>C-x v v</kbd> (i.e., [`vc-next-action`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Basic-VC-Editing.html)). If you don't know about it -- try it, it is incredibly useful!
>>>>>>> (I must say that formatting of this report is AWFUL! How can a human
>>>>>>> being be expected to read and understand it it?? PLEASE try to make
>>>>>>> bug reports more readable in the future.)
>>>>>> Looked fine to me.
>>>>>>
>>>>>> I think the Markdown format is very readable.
>>>>> It isn't Markdown that bothered me, it's some kind of HTML mixed in,
>>>>> but in an email message whose format is plain text (at least as I got
>>>>> it here).
>>>>
>>>> The <kbd> tags? These are also supported by Markdown. The links too.
>>>>
>>>>>> I think this is the same as bug#65049, meaning that it's fixed on
>>>>>> master, but not in Emacs 29.1 (which was the version specified in the
>>>>>> report).
>>>>> Possibly. If Sam says it works for him on master, we will know.
>>>>
>>>> Yes, let's see what he says.
>>>
>>> Sam, could you please chime in after testing this in Emacs 30?
>>>
>>> Thanks.
>
> No further comments within a month, so I presume the bug is indeed
> fixed on master, and I'm therefore closing it.
Yes: Sam confirmed that in a SE comment.
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2024-02-10 11:44 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-11 2:07 bug#68377: Cannot commit parts of *vc-diff* on Microsoft Windows Sam Steingold
2024-01-11 12:28 ` Eli Zaretskii
2024-01-11 12:44 ` Eli Zaretskii
2024-01-11 12:54 ` Eli Zaretskii
2024-01-11 13:19 ` Dmitry Gutov
2024-01-11 14:47 ` Eli Zaretskii
2024-01-11 15:07 ` Dmitry Gutov
2024-01-14 16:42 ` Eli Zaretskii
2024-01-27 9:11 ` Eli Zaretskii
2024-02-10 8:06 ` Eli Zaretskii
2024-02-10 11:44 ` Dmitry Gutov
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).