bug-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#68443: 30.0.50; Cannot commit from *vc-diff* if there is a deleted f


From: Eli Zaretskii
Subject: bug#68443: 30.0.50; Cannot commit from *vc-diff* if there is a deleted file.
Date: Wed, 17 Jan 2024 13:34:31 +0200

> Date: Wed, 17 Jan 2024 06:25:34 +0200
> From: Dmitry Gutov <dmitry@gutov.dev>
> 
> Try the patch below, seems to work here:
> 
> diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
> index 03efe0fdb31..83d580d98dd 100644
> --- a/lisp/vc/diff-mode.el
> +++ b/lisp/vc/diff-mode.el
> @@ -3014,7 +3014,7 @@ diff-vc-deduce-fileset
>         (goto-char (point-min))
>         (while (progn (diff-file-next) (not (eobp)))
>           (push (diff-find-file-name nil t) files)))
> -    (list backend (nreverse files) nil nil 'patch)))
> +    (list backend (delete nil (nreverse files)) nil nil 'patch)))
> 
>   (defun diff--filter-substring (str)
>     (when diff-font-lock-prettify
> 
> 
> (Eli, would this be suitable for emacs-29?)

Yes, thanks.  Just do it soon, please, if you can.





reply via email to

[Prev in Thread] Current Thread [Next in Thread]