From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 10 21:07:29 2024 Received: (at submit) by debbugs.gnu.org; 11 Jan 2024 02:07:29 +0000 Received: from localhost ([127.0.0.1]:43614 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNkTh-0003R5-3m for submit@debbugs.gnu.org; Wed, 10 Jan 2024 21:07:29 -0500 Received: from lists.gnu.org ([2001:470:142::17]:35716) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNkTe-0003Qr-W3 for submit@debbugs.gnu.org; Wed, 10 Jan 2024 21:07:27 -0500 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 1rNkTa-0004L8-8E for bug-gnu-emacs@gnu.org; Wed, 10 Jan 2024 21:07:22 -0500 Received: from mail-qv1-xf32.google.com ([2607:f8b0:4864:20::f32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNkTX-0006VS-Op; Wed, 10 Jan 2024 21:07:21 -0500 Received: by mail-qv1-xf32.google.com with SMTP id 6a1803df08f44-680a06cc763so31190156d6.1; Wed, 10 Jan 2024 18:07:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704938836; x=1705543636; darn=gnu.org; h=mime-version:message-id:date:reply-to:return-receipt-to:subject:to :from:sender:from:to:cc:subject:date:message-id:reply-to; bh=QM8OJlK70ZjMfjX/sllXDTd9kYztjrZHM5UzpeXLDxk=; b=HjfL63e2oGDvRG+cg4ztyGfLdVVxrDqY5N3AP8n+Irgn4vj1mwO3Fet61tPQFUR1mB bxHHVR1Xl90n224R2J8nG4TcoPpPa7g3RWxNNpQQq2sH+csYlQ0IBAetNT8Ru+wqPUif Xl6vEV8EYJ3Bz+x0fqPHsvn8O/Qo7SG3wloWpjnAobzWIY8w6mEl5FDyBnC8LbkeC+BG 5OyxOhhKxubjUve5PG2+sRxFThBLxersumNgOzWEHz2JDHB4Tq16XHlXKPs1jE6NWttc ypXNdAGPZMeL9GTf8NB/+eJrxj87EImYeQXs5mTKcLY3Krmjswlyf1OQb8MnKBHGjF5J yUPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704938836; x=1705543636; h=mime-version:message-id:date:reply-to:return-receipt-to:subject:to :from:sender:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=QM8OJlK70ZjMfjX/sllXDTd9kYztjrZHM5UzpeXLDxk=; b=ATPAr8G/1VCyS+3JdJIAAmgFQbz6ztmqM9ls9Wm9mQfc/i6WzOEs3Vd4O7freluTgm UDsNHv+t3iWsPOikKKaZTFnVhazQgVmYiLOeG6nHpqOqVB9TKmdopR2pSJeqUkOyDpUW 8WKaHAf3lEsY0nbc9Lq29KR6Y/avcFx1OQMnAY68EAvLYJ9xm7ZlX5hasO8qnlgB3YL5 YRCRKC2y6XQ7ajBR5dYCpPNPHSII2gISNGF2n64fxLVCyDApSF12IDAvGCr52wyZQsKW sD3jgSX0gpj8Jcv+kZK1VQE+FbDPFwIkFyTcqqd1alSTANPD4LB9TzgXxZrRdowmu38i +WJw== X-Gm-Message-State: AOJu0YykZ1QPM6bF+r0Em2gFIp21wn2sFKJdaSrMw7GW4u91MoO6nQrw AcL3XcLJNNtiNOSXv2uFG9yNbJylzw== X-Google-Smtp-Source: AGHT+IFnefhC2ZONfkS4UQTU8aZZvavA+Fh6aM3fC2ERdtOzXuZRl89PiJwkNuZVpuIq7UBKbyQ+Hw== X-Received: by 2002:a05:6214:248b:b0:67f:c76:e9e8 with SMTP id gi11-20020a056214248b00b0067f0c76e9e8mr535542qvb.16.1704938836095; Wed, 10 Jan 2024 18:07:16 -0800 (PST) Received: from pop-os (pool-108-6-133-45.nycmny.fios.verizon.net. [108.6.133.45]) by smtp.gmail.com with ESMTPSA id do7-20020a056214096700b006810e650503sm2138814qvb.80.2024.01.10.18.07.14 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Jan 2024 18:07:15 -0800 (PST) From: Sam Steingold To: bug-gnu-emacs@gnu.org Subject: Cannot commit parts of *vc-diff* on Microsoft Windows X-Attribution: Sam X-Disclaimer: You should not expect anyone to agree with me. X-Debbugs-Cc: Date: Wed, 10 Jan 2024 21:07:14 -0500 Message-ID: <87le8wy65p.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2607:f8b0:4864:20::f32; envelope-from=sam.steingold@gmail.com; helo=mail-qv1-xf32.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, WEIRD_PORT=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.5 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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 C-x v = in a file [...] Content analysis details: (1.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (sam.steingold[at]gmail.com) 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.2 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: sds@gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) 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 C-x v = in a file buffer or by = in a `*vc-dir*` buffer), kill unwanted hunks with k (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 C-x v v (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 C-c C-c (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). From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 11 07:29:30 2024 Received: (at 68377) by debbugs.gnu.org; 11 Jan 2024 12:29:30 +0000 Received: from localhost ([127.0.0.1]:58956 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNuBe-0001Mf-2c for submit@debbugs.gnu.org; Thu, 11 Jan 2024 07:29:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43606) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNuBb-0001MS-4f for 68377@debbugs.gnu.org; Thu, 11 Jan 2024 07:29:29 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rNuBW-0004X9-IP; Thu, 11 Jan 2024 07:29:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=3p7ihYQ/qotXQjm2KXCOyYhHoknptlWYMJJsVuJEA+U=; b=OoaVNuT0UpvK MNnFjdmf8GcsyOFtCTVWp5TixEtuFld/X5NdUA7a9BnHWTYc0VOB81L7O1zDJDwEWRIUBG9JaeF2s xxaPXuRjWbpQG5lLVexmlrzQJIjJlESnrCvYmhoBRtEuFZZpcLuKr+anoQp2fC8AaG1PssOad2TUK AXR1KRBMpU3VOgWqh0oRkgKypxeSd/YmJF8G2XSVptkXg7syD7xcsVRpfRcv4CxEUQGZSv2jKAOBM p9cwibOgvGI5SP9KF7pbG/FH2sjOzJTLSFnc1g2uv23V+TAlOUrINmZPBIwW1CgFALB7UMpq/3sqU PX64h7qQ2oqLYCoY+GGrqQ==; Date: Thu, 11 Jan 2024 14:28:49 +0200 Message-Id: <83r0iokq9q.fsf@gnu.org> From: Eli Zaretskii To: sds@gnu.org In-Reply-To: <87le8wy65p.fsf@gnu.org> (message from Sam Steingold on Wed, 10 Jan 2024 21:07:14 -0500) Subject: Re: bug#68377: Cannot commit parts of *vc-diff* on Microsoft Windows References: <87le8wy65p.fsf@gnu.org> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 68377 Cc: 68377@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Sam Steingold > 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 C-x v = in a file buffer or by = in a `*vc-dir*` buffer), kill unwanted hunks with k (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 C-x v v (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 C-c C-c (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. From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 11 07:45:07 2024 Received: (at 68377) by debbugs.gnu.org; 11 Jan 2024 12:45:08 +0000 Received: from localhost ([127.0.0.1]:58996 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNuQl-0004iR-DR for submit@debbugs.gnu.org; Thu, 11 Jan 2024 07:45:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59366) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNuQi-0004S4-JI for 68377@debbugs.gnu.org; Thu, 11 Jan 2024 07:45:05 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rNuQf-00037Z-BR; Thu, 11 Jan 2024 07:45:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=zYNRh+qwdMYrRf3znT1TFzpkvjNXhY7mdC7a7LhKWig=; b=gRT4AKQLrEgp 7EWnrUmFYCrHADBn29uwoZP2Nizjf3wRE1yusLEUehH6LlSpIYChvBMHt4nnq/xBFKFnaL3A60XHX MB6+mi3HIoDEgxWjs+GnEGPr26QYYd9/PgZBXTgNqkpQbQt7kXnMRihw14zT89GJ2YfuNooJmuJs7 aKXV+YCumPeJ/PSCcQ7VOG4fs0aOpiKzGDMPNd1p1FsSgr6EkC4X5KzCzMxC/yTb7gQLSnRmFQi05 f1Yp7GcMTYpfhbVJi5Gm6+6onP+8sj/KYJl1OLT3G6vU+CJMlCJatkGerql0OHbk7qrhm3NHHHWPM wPS0k1XrZGyVAcnmLdef6w==; Date: Thu, 11 Jan 2024 14:44:41 +0200 Message-Id: <83ply8kpja.fsf@gnu.org> From: Eli Zaretskii To: sds@gnu.org In-Reply-To: <83r0iokq9q.fsf@gnu.org> (message from Eli Zaretskii on Thu, 11 Jan 2024 14:28:49 +0200) Subject: Re: bug#68377: Cannot commit parts of *vc-diff* on Microsoft Windows References: <87le8wy65p.fsf@gnu.org> <83r0iokq9q.fsf@gnu.org> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 68377 Cc: 68377@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > Cc: 68377@debbugs.gnu.org > Date: Thu, 11 Jan 2024 14:28:49 +0200 > From: Eli Zaretskii > > > # 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). From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 11 07:54:56 2024 Received: (at 68377) by debbugs.gnu.org; 11 Jan 2024 12:54:56 +0000 Received: from localhost ([127.0.0.1]:59009 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNuaF-0007SA-Nt for submit@debbugs.gnu.org; Thu, 11 Jan 2024 07:54:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55048) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNuaE-0007Rw-0U for 68377@debbugs.gnu.org; Thu, 11 Jan 2024 07:54:54 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rNuaB-0008Ek-2c; Thu, 11 Jan 2024 07:54:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=8zoleVNgTT9CtYmYDxwPByjGG51RqZVK+V48cOqX11A=; b=nGfgYE0yoURy Kb+Sqc2r/C+sHa0BPGTHY6SIExrhX/HSEnH5Wau3XhTeYxUWOSgxRMpHBpo7dlV372mtsj03kBcAc KD+dcQqzct7CU3l6hPIcZg9PQdXZyYjaCZJC3E/4iKMwAQu/UjJ1Kcal9Q8U6GAvBfYD7cqvqaW28 dSaZYbKLQkGB2Y0AV3KgHjrHDRI+Cp3d/6KzN/MvSHnvHopt+hwGYdt6qc58iWwP1h1werc8+r8o9 FqNEQJfWIhPn/V9fU6cGsA/dvQgkdQe+wsXwxqEh/bZD5QAnwp4tfxGM3PeA4jecIsMQBSzh0Rs9V 06fIUdKavKCaa8iuuNjyRQ==; Date: Thu, 11 Jan 2024 14:54:27 +0200 Message-Id: <83o7dskp30.fsf@gnu.org> From: Eli Zaretskii To: sds@gnu.org In-Reply-To: <83ply8kpja.fsf@gnu.org> (message from Eli Zaretskii on Thu, 11 Jan 2024 14:44:41 +0200) Subject: Re: bug#68377: Cannot commit parts of *vc-diff* on Microsoft Windows References: <87le8wy65p.fsf@gnu.org> <83r0iokq9q.fsf@gnu.org> <83ply8kpja.fsf@gnu.org> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 68377 Cc: 68377@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > Cc: 68377@debbugs.gnu.org > Date: Thu, 11 Jan 2024 14:44:41 +0200 > From: Eli Zaretskii > > 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. From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 11 08:19:36 2024 Received: (at 68377) by debbugs.gnu.org; 11 Jan 2024 13:19:36 +0000 Received: from localhost ([127.0.0.1]:59045 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNuy7-0004yL-L5 for submit@debbugs.gnu.org; Thu, 11 Jan 2024 08:19:36 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:34779) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNuy5-0004y3-0A for 68377@debbugs.gnu.org; Thu, 11 Jan 2024 08:19:34 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 3CF385C00EE; Thu, 11 Jan 2024 08:19:29 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Thu, 11 Jan 2024 08:19:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm1; t=1704979169; x=1705065569; bh=yVIGdAikafgrHKy+yqkX3ED6E2A3Bj2o77dQ1WB7NOE=; b= CTnHWJHHkq3Uldx56uGavBSSmUFo6Sj+ZaquD7SQkscBpzdMf362xI1zdv1n6Oq0 0aTwnPg8vmNw4AMsIl+B3GTZUgyzLqtZZpPpCA0tpsjp90g+zx059UL5STYyj93J J8CEGXagELx58Wh7pgeNFADy+VB/0hY9tFYznOx/+eDFwErjAc1RpDKtZVo9Z6jp aP+COxAQ5QHUgoj3v5Wl5NJK3ADHmlq2RxPmB+LjhzfxiVXTffKbw7cQFSHGEzsq tQJrb6H8BsxNBv1mVxbLG1D2gYAwFCPrgybQMorNOkqlrDXUmDq+6I3/wq+qA6x1 t9jy5welUrXs9iYEAkaPaw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1704979169; x= 1705065569; bh=yVIGdAikafgrHKy+yqkX3ED6E2A3Bj2o77dQ1WB7NOE=; b=N mgp1Jf/JqxzoFh8gagdycER4MJ1bDvaZxTzF5PtNd/Y9FNJwCm/KviINQbUm6yuN UayBlUh0812hAmsdEgTQoCs2Gjrw4wjyRSMRPtngeMYk8S7aAeknmxLSw9qM+Q26 +bpp3cCmMoVNGMZ1lcCaZ1XOUYYAAAo7jtf5My0SXr0Z+zZlPWmTRp8FMo5rC3bJ ooKxXXQ8gGG1Lo7XxKsXNvqu3AxL0yBU2en83bTmxc1FGil9Zr7+Cgq0cYtEvEyK j0MSrbTW9f66+U6ySIIfkuzUDeCPyVAqV57oP2VzOkgHk+y+V57jfVBwNNB38qe8 NrRf/qPL+g1uISME4gY2Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdeifedghedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvvehfhfgjtgfgsehtjeertddtvdejnecuhfhrohhmpeffmhhi thhrhicuifhuthhovhcuoegumhhithhrhiesghhuthhovhdruggvvheqnecuggftrfgrth htvghrnhepvdffgfeltdejleetvdejkeejkeelleefgeeuveelkeegvdekueegfeekfedv jeejnecuffhomhgrihhnpehsthgrtghkvgigtghhrghnghgvrdgtohhmpdhgnhhurdhorh hgpdhgihhtfhhorhifihhnughofihsrdhorhhgnecuvehluhhsthgvrhfuihiivgeptden ucfrrghrrghmpehmrghilhhfrhhomhepughmihhtrhihsehguhhtohhvrdguvghv X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 11 Jan 2024 08:19:27 -0500 (EST) Message-ID: <65db305f-0606-445b-b034-fc069800a244@gutov.dev> Date: Thu, 11 Jan 2024 15:19:26 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: bug#68377: Cannot commit parts of *vc-diff* on Microsoft Windows Content-Language: en-US To: Eli Zaretskii , sds@gnu.org References: <87le8wy65p.fsf@gnu.org> <83r0iokq9q.fsf@gnu.org> From: Dmitry Gutov In-Reply-To: <83r0iokq9q.fsf@gnu.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 68377 Cc: 68377@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On 11/01/2024 14:28, Eli Zaretskii wrote: >> From: Sam Steingold >> 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 C-x v = in a file buffer or by = in a `*vc-dir*` buffer), kill unwanted hunks with k (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 C-x v v (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 C-c C-c (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). From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 11 09:47:31 2024 Received: (at 68377) by debbugs.gnu.org; 11 Jan 2024 14:47:31 +0000 Received: from localhost ([127.0.0.1]:59167 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNwLC-0006Qw-GC for submit@debbugs.gnu.org; Thu, 11 Jan 2024 09:47:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42634) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNwLA-0006Qh-51 for 68377@debbugs.gnu.org; Thu, 11 Jan 2024 09:47:28 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rNwL7-0006HU-6n; Thu, 11 Jan 2024 09:47:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=HwzN7G0WEbEA75F/rh8qLCk7+btFODaIr19t1QVGVVI=; b=pCQtuAX23xuO vesYgK3qBAWO04em427tNe9cSJl+ydnG9HHf6o00xhbzJSzrjiz3xWYKGgYWstFAMu14V40BpU5n2 nu5DCCV+RmkZxXiXuHEGgj7JrhWWMPvMRh/Xdimul0084YcYuWgg2UZ2Kzjymxi9JTcxNVAgq5PBL WkHgQsxi1qh4FINGTLUyYa6rpgh74k32/riynAuha6miwo/2GIyP+PyONkwthHB1mOwCyz4VPJtQr p+L5BsT+nBGtNJohIXQjhfpIURp4ADUIdYPj7IRUcx4p9xwYmCIim36ZVvOVsQimNkmodamcTXeWx Ex4vkD8+gS7B4RFInqYJvA==; Date: Thu, 11 Jan 2024 16:47:10 +0200 Message-Id: <83jzogkjv5.fsf@gnu.org> From: Eli Zaretskii To: Dmitry Gutov In-Reply-To: <65db305f-0606-445b-b034-fc069800a244@gutov.dev> (message from Dmitry Gutov on Thu, 11 Jan 2024 15:19:26 +0200) Subject: Re: bug#68377: Cannot commit parts of *vc-diff* on Microsoft Windows References: <87le8wy65p.fsf@gnu.org> <83r0iokq9q.fsf@gnu.org> <65db305f-0606-445b-b034-fc069800a244@gutov.dev> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 68377 Cc: 68377@debbugs.gnu.org, sds@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > Date: Thu, 11 Jan 2024 15:19:26 +0200 > Cc: 68377@debbugs.gnu.org > From: Dmitry Gutov > > On 11/01/2024 14:28, Eli Zaretskii wrote: > >> From: Sam Steingold > >> 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 C-x v = in a file buffer or by = in a `*vc-dir*` buffer), kill unwanted hunks with k (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 C-x v v (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. From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 11 10:07:58 2024 Received: (at 68377) by debbugs.gnu.org; 11 Jan 2024 15:07:58 +0000 Received: from localhost ([127.0.0.1]:33588 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNwf0-0001wo-8p for submit@debbugs.gnu.org; Thu, 11 Jan 2024 10:07:58 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:46495) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNwex-0001wZ-Fq for 68377@debbugs.gnu.org; Thu, 11 Jan 2024 10:07:56 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 674D55C00FE; Thu, 11 Jan 2024 10:07:52 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Thu, 11 Jan 2024 10:07:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm1; t=1704985672; x=1705072072; bh=uK2aWT8Xn0fVA8fxkKRn2nXaSa0dcc2ohdILO7GPV8c=; b= jZ0U0Ga8SfraZCbAS0qPbSQXq4bP3qY2QaLRZmMrRJ+y2uisbxAzr7W/M/44IjCT wk/uJhjDmOo098xBVasFv6q+yiWUkGWgdG/8Ej3+d5xNtP763EJR0XecNA+FsNqd W7nNLcIAYanCiNO0EJfwuGAHnesCV6IRWau6tEyXwDSJXHLJYt6mqbuSKhD6qtSn gj0xzi5iqjpoLda+Q3AyLuMvLcmg48AAum0Dk6KRLy3H891228xSASMyTl+quq6p w1rIqRKCK3MldBmA3hortXwOmjxuHvKZWsWP3QKvSks307sXxSPKTmLDMwsyxydI e1o7SqEPdSZsvuGJ1nBFtg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1704985672; x= 1705072072; bh=uK2aWT8Xn0fVA8fxkKRn2nXaSa0dcc2ohdILO7GPV8c=; b=t 8DWO/JgcBk30T+5ipiC/HKDqpnoIcvuU9bLucanAZ/6jwemmFyMTvdREx65yP1TM 0TF1H810ktaJmKsL5uiMJbjfzMItMQmQZXtgGlt1oiM5qC85Lqsc2LLkopEJnj+g z+MAsWiwrSvpRy1zQ0dPlj2VdWYk/VcYwdBtEMFoyA7g45E4ntztnA6X/WBK4PVU qz1c3mpdTk8WGL1T6bGSeNMREl2+v8L6TIzCGaIpUITpve2yPPpzHcPRXt9pL4J/ xs+UrjK+prmcR3nnmMrqm/250kPaVXerYeAWYqm/gPui/gpa6MfHeSmvgNkmSEq6 lYPoIbeoPuTbrEKtSo5lw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdeifedgjeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvvehfhfgjtgfgsehtjeertddtvdejnecuhfhrohhmpeffmhhi thhrhicuifhuthhovhcuoegumhhithhrhiesghhuthhovhdruggvvheqnecuggftrfgrth htvghrnhepffeujeethfeigfekkedtjeeghfegueejfeekveeiheeileffudfhheejudet tddvnecuffhomhgrihhnpehsthgrtghkvgigtghhrghnghgvrdgtohhmpdhgnhhurdhorh hgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepughm ihhtrhihsehguhhtohhvrdguvghv X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 11 Jan 2024 10:07:50 -0500 (EST) Message-ID: <7b1d2533-b214-4646-9145-5de678759009@gutov.dev> Date: Thu, 11 Jan 2024 17:07:48 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: bug#68377: Cannot commit parts of *vc-diff* on Microsoft Windows Content-Language: en-US To: Eli Zaretskii References: <87le8wy65p.fsf@gnu.org> <83r0iokq9q.fsf@gnu.org> <65db305f-0606-445b-b034-fc069800a244@gutov.dev> <83jzogkjv5.fsf@gnu.org> From: Dmitry Gutov In-Reply-To: <83jzogkjv5.fsf@gnu.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 68377 Cc: 68377@debbugs.gnu.org, sds@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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 >> >> On 11/01/2024 14:28, Eli Zaretskii wrote: >>>> From: Sam Steingold >>>> 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 C-x v = in a file buffer or by = in a `*vc-dir*` buffer), kill unwanted hunks with k (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 C-x v v (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 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. From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 14 11:43:07 2024 Received: (at 68377) by debbugs.gnu.org; 14 Jan 2024 16:43:07 +0000 Received: from localhost ([127.0.0.1]:44045 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rP3Zi-0005Pu-Jt for submit@debbugs.gnu.org; Sun, 14 Jan 2024 11:43:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57836) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rP3Zf-0005PP-P8 for 68377@debbugs.gnu.org; Sun, 14 Jan 2024 11:43:04 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rP3Za-0007n9-UO; Sun, 14 Jan 2024 11:42:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=gZFJCSFcj2Ny4TfRACdXmLnW8V6IEUayUwkOfTcZNyU=; b=XG5HV5ys8gGh AZLgn9RX46pBtfqRx4CFGqFdc+3HsaGjZZR2Rkoe4+EL7HC7M/0tNo/alVewbjORwNgSsQ5epWAe0 WkOePkNegT29PQtZ2XQ3ov+3vvqFhYBf7aEVuuNkEZfQpMXkCvctTQN4ViN4AshWHpc4BTG2c3H0B VhRowr0MSGqgqosR3Dz0c/Gb7CwbODftgYrk6oEHwcDfoJxSFhC7Ne8AWUMOaPWkbdmQo4ik/+Cli RFy2Nhh0Wr2vRth8z5ccks2wScZxmbaXWpd924aoXBdUzdvM/ht1vn2ZF4pnOVkeLVJwIyPxZ14CF riu3DP3sHiPLwXPGxnQWWQ==; Date: Sun, 14 Jan 2024 18:42:41 +0200 Message-Id: <83ttnfeuim.fsf@gnu.org> From: Eli Zaretskii To: Dmitry Gutov In-Reply-To: <7b1d2533-b214-4646-9145-5de678759009@gutov.dev> (message from Dmitry Gutov on Thu, 11 Jan 2024 17:07:48 +0200) Subject: Re: bug#68377: Cannot commit parts of *vc-diff* on Microsoft Windows References: <87le8wy65p.fsf@gnu.org> <83r0iokq9q.fsf@gnu.org> <65db305f-0606-445b-b034-fc069800a244@gutov.dev> <83jzogkjv5.fsf@gnu.org> <7b1d2533-b214-4646-9145-5de678759009@gutov.dev> X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: 68377 Cc: 68377@debbugs.gnu.org, sds@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) > Date: Thu, 11 Jan 2024 17:07:48 +0200 > From: Dmitry Gutov > 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 > >> > >> On 11/01/2024 14:28, Eli Zaretskii wrote: > >>>> From: Sam Steingold > >>>> 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 C-x v = in a file buffer or by = in a `*vc-dir*` buffer), kill unwanted hunks with k (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 C-x v v (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 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. From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 27 04:11:40 2024 Received: (at 68377) by debbugs.gnu.org; 27 Jan 2024 09:11:40 +0000 Received: from localhost ([127.0.0.1]:53454 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTeiy-0006Al-9q for submit@debbugs.gnu.org; Sat, 27 Jan 2024 04:11:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49658) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTeiw-0006AZ-IJ for 68377@debbugs.gnu.org; Sat, 27 Jan 2024 04:11:39 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rTeik-0000cp-46; Sat, 27 Jan 2024 04:11:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=EFddakOz3JjePqLnF8GpxeKDAXwbC8n6zTg+1kb/wb0=; b=CLbZH+8XWLcX bY4bDX1WAAeWsfyjsEtClAuSuEPhxoSYdESG3BUsIUM/QQwFxliBMc9ov1KkL+EhTxo1tDWi9/CEO uP/C2RRLgxiyLhqAaopVQi51+HhDD/n9A2335SvI9lHRXvkkxwVEsIO5BVupR0Pt6RKofGH/noy/0 BSIPZDXRRDj9yKWLOdmakQICZcJHtby++awe2Ys8IoW9IGk8VB7CuwA2P6jnXq8QqGGOvp+IAOWDv IWsj7LXt3YXxh3qkrKZNM8zAfM2xdYpL1bNKZbmaKKQDr1xUDOqVSh/yd+mIrxTPltKX7nrY6kXEJ UaPyD1VlyFUc1B4Ukt/JoQ==; Date: Sat, 27 Jan 2024 11:11:24 +0200 Message-Id: <86y1cb87k3.fsf@gnu.org> From: Eli Zaretskii To: sds@gnu.org In-Reply-To: <83ttnfeuim.fsf@gnu.org> (message from Eli Zaretskii on Sun, 14 Jan 2024 18:42:41 +0200) Subject: Re: bug#68377: Cannot commit parts of *vc-diff* on Microsoft Windows References: <87le8wy65p.fsf@gnu.org> <83r0iokq9q.fsf@gnu.org> <65db305f-0606-445b-b034-fc069800a244@gutov.dev> <83jzogkjv5.fsf@gnu.org> <7b1d2533-b214-4646-9145-5de678759009@gutov.dev> <83ttnfeuim.fsf@gnu.org> X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: 68377 Cc: 68377@debbugs.gnu.org, dmitry@gutov.dev X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) 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 > > > Date: Thu, 11 Jan 2024 17:07:48 +0200 > > From: Dmitry Gutov > > 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 > > >> > > >> On 11/01/2024 14:28, Eli Zaretskii wrote: > > >>>> From: Sam Steingold > > >>>> 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 C-x v = in a file buffer or by = in a `*vc-dir*` buffer), kill unwanted hunks with k (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 C-x v v (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 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. > > > > From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 10 03:07:14 2024 Received: (at 68377-done) by debbugs.gnu.org; 10 Feb 2024 08:07:14 +0000 Received: from localhost ([127.0.0.1]:50940 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rYiOG-0002yw-Rw for submit@debbugs.gnu.org; Sat, 10 Feb 2024 03:07:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56842) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rYiOE-0002yQ-6L for 68377-done@debbugs.gnu.org; Sat, 10 Feb 2024 03:07:11 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rYiNt-0003Uf-7W; Sat, 10 Feb 2024 03:06:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=TrOVdojNzGMVWNaDtSoKqoS2b1PY5wGIcDkcFNjcxyw=; b=ZjJStOh0BmBJ KQHmbKAquxXP4zrGuOe7fhZAevB0hNMa6S5UN8DprS3sLVfbD4HIelJVKSBCTAbS8uKcahLYRyZN/ rUpYy7gz9uxIeylCXn4KANcvEyg0cGRvMFRBBYHVCQJl1r37oIrb9sr4TRiaBxQHNcDr7+zISSy2X ZLf5/BWGZ6+31VUK4hLMYDxEM/IUUzvRfshZEBTeMCIVqgpJfa/KI3vyiZ7CYYg76pdMZVHS9ndIG 7HEoLuo+z1kPM/bzttuYDq4UXhiC1NYBDCl1dW+GlPyh5rOO/EBpa6YUrlly6CRSj7U2wQweuKF63 Dk4dkh4W8EJL1b06weK29A==; Date: Sat, 10 Feb 2024 10:06:45 +0200 Message-Id: <86il2wvj3e.fsf@gnu.org> From: Eli Zaretskii To: sds@gnu.org In-Reply-To: <86y1cb87k3.fsf@gnu.org> (message from Eli Zaretskii on Sat, 27 Jan 2024 11:11:24 +0200) Subject: Re: bug#68377: Cannot commit parts of *vc-diff* on Microsoft Windows References: <87le8wy65p.fsf@gnu.org> <83r0iokq9q.fsf@gnu.org> <65db305f-0606-445b-b034-fc069800a244@gutov.dev> <83jzogkjv5.fsf@gnu.org> <7b1d2533-b214-4646-9145-5de678759009@gutov.dev> <83ttnfeuim.fsf@gnu.org> <86y1cb87k3.fsf@gnu.org> X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: 68377-done Cc: 68377-done@debbugs.gnu.org, dmitry@gutov.dev X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) > Cc: 68377@debbugs.gnu.org, dmitry@gutov.dev > Date: Sat, 27 Jan 2024 11:11:24 +0200 > From: Eli Zaretskii > > 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 > > > > > Date: Thu, 11 Jan 2024 17:07:48 +0200 > > > From: Dmitry Gutov > > > 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 > > > >> > > > >> On 11/01/2024 14:28, Eli Zaretskii wrote: > > > >>>> From: Sam Steingold > > > >>>> 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 C-x v = in a file buffer or by = in a `*vc-dir*` buffer), kill unwanted hunks with k (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 C-x v v (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 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. From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 10 06:51:30 2024 Received: (at 68377-done) by debbugs.gnu.org; 10 Feb 2024 11:51:30 +0000 Received: from localhost ([127.0.0.1]:35284 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rYltK-0001bY-Bx for submit@debbugs.gnu.org; Sat, 10 Feb 2024 06:51:30 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:55569) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rYltE-0001b3-5M for 68377-done@debbugs.gnu.org; Sat, 10 Feb 2024 06:51:28 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 3BF255C00AC; Sat, 10 Feb 2024 06:44:03 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Sat, 10 Feb 2024 06:44:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1707565443; x=1707651843; bh=XgmO4T7Cuki5guLygGrp1LibJQ8OfIvgyTSWFC8wSqA=; b= GKG4zjoe8zheKwFwvNgtuWJZoLVNL2Eog2o76KkLnMo/Ewtr2XyiZlTdeSnitJd9 FW+X7Eet3qzvgsWHvBUrDkmKC3TYviURxBdynBQXkWCxTqMdiIn5XVBgnFyIAmjr sCaGAt3XDZU23+U3MEOZJhyrM/bkaYrE61NzIsXyxLJjk0x+puAvmnz0fmJnVMjm Q+UCOGXSDCuU54JddbOCMMepivmTkbIyH1vQhZmZbw+WCMWxKCz7J+qL014AfzkY 0/tQYD6cQKbPuK8l3YVOEzAJNq8heXJa6ZISevRJVss6S20muCeaXciQTUKWHBe6 Csw9VtwbdhYTdiFDMsyaaQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1707565443; x= 1707651843; bh=XgmO4T7Cuki5guLygGrp1LibJQ8OfIvgyTSWFC8wSqA=; b=L QvrajskDtZnuf0Dy/UHRkTPwf2BUCIkcE/fBGmA1Sq6QFQOMKoLRIfiXkSs2fbYG /6UUZMO7K14S/QbP/EgIFXzQOUdSv007ghn0qzETGsVEqhsp0a5cSKM6TQEcr+qC zA1m3Wo1aRtPGztH4KOPuFC4vyPOAy//KABsR1DBHMBPyhf2c3saVMMY5hZ0I5VS d2WKd4WO/goLV/ipBfznbtiSvMij3/ybgbk78ni6picNR9N0sTcoFg1jRi9ydBFH jkg07qfKr5eJvOV1iJ6Yw0aTbnxYoLgMfQs9t6FXA0BuEi5V6x5wl9/cdTXRVqkX fNSNbSTztF9TiC7m00JAg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrtdelgddtiecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefkffggfgfuvfevfhfhjggtgfesthejredttddvjeenucfhrhhomhepffhmihht rhihucfiuhhtohhvuceoughmihhtrhihsehguhhtohhvrdguvghvqeenucggtffrrghtth gvrhhnpeffueejtefhiefgkeektdejgefhgeeujeefkeevieehieelffduhfehjedutedt vdenucffohhmrghinhepshhtrggtkhgvgigthhgrnhhgvgdrtghomhdpghhnuhdrohhrgh enucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegumhhi thhrhiesghhuthhovhdruggvvh X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 10 Feb 2024 06:44:02 -0500 (EST) Message-ID: <5e669d92-7fa8-495c-8df2-c9f712118d51@gutov.dev> Date: Sat, 10 Feb 2024 13:44:00 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: bug#68377: Cannot commit parts of *vc-diff* on Microsoft Windows Content-Language: en-US To: Eli Zaretskii , sds@gnu.org References: <87le8wy65p.fsf@gnu.org> <83r0iokq9q.fsf@gnu.org> <65db305f-0606-445b-b034-fc069800a244@gutov.dev> <83jzogkjv5.fsf@gnu.org> <7b1d2533-b214-4646-9145-5de678759009@gutov.dev> <83ttnfeuim.fsf@gnu.org> <86y1cb87k3.fsf@gnu.org> <86il2wvj3e.fsf@gnu.org> From: Dmitry Gutov In-Reply-To: <86il2wvj3e.fsf@gnu.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 68377-done Cc: 68377-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 >> >> 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 >>> >>>> Date: Thu, 11 Jan 2024 17:07:48 +0200 >>>> From: Dmitry Gutov >>>> 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 >>>>>> >>>>>> On 11/01/2024 14:28, Eli Zaretskii wrote: >>>>>>>> From: Sam Steingold >>>>>>>> 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 C-x v = in a file buffer or by = in a `*vc-dir*` buffer), kill unwanted hunks with k (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 C-x v v (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 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. From unknown Sat Aug 16 18:38:42 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 09 Mar 2024 12:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator