From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs 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 Message-ID: <83ply0b3co.fsf@gnu.org> References: <874jfhe3r4.fsf@disroot.org> <9dfe6be4-afa8-430e-a45e-e651c479cb81@gutov.dev> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="27271"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 68443@debbugs.gnu.org, avityazev@disroot.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Jan 17 12:35:16 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rQ4CS-0006r4-Nw for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 17 Jan 2024 12:35:16 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQ4CF-00044T-M1; Wed, 17 Jan 2024 06:35:03 -0500 Original-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 1rQ4CE-00044K-4i for bug-gnu-emacs@gnu.org; Wed, 17 Jan 2024 06:35:02 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQ4CD-0005M7-TB for bug-gnu-emacs@gnu.org; Wed, 17 Jan 2024 06:35:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQ4CE-0008Nv-Id for bug-gnu-emacs@gnu.org; Wed, 17 Jan 2024 06:35:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 17 Jan 2024 11:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68443 X-GNU-PR-Package: emacs Original-Received: via spool by 68443-submit@debbugs.gnu.org id=B68443.170549129032202 (code B ref 68443); Wed, 17 Jan 2024 11:35:02 +0000 Original-Received: (at 68443) by debbugs.gnu.org; 17 Jan 2024 11:34:50 +0000 Original-Received: from localhost ([127.0.0.1]:50977 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQ4C1-0008NK-JU for submit@debbugs.gnu.org; Wed, 17 Jan 2024 06:34:49 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:59510) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQ4By-0008N5-R0 for 68443@debbugs.gnu.org; Wed, 17 Jan 2024 06:34:47 -0500 Original-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 1rQ4Bs-0005Kg-4o; Wed, 17 Jan 2024 06:34:40 -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=uqLyd0C1wuyaIkvxkPbqt6w2oITAPMCR0wcYRJFDkMA=; b=PdO1GrJRdDeo kzfSMw1elUB7Zn9rLKAKFcGPR2+v4gm78+OkfKBrMLBWD1johMd8oOfA9Hj7OfYBBuwQWqiVh5Sri 30x6is/NH79WpXjPKL0ZHoMbcCzeJ3G6LP4IKQyAtE+57tSQaJUKV6obyGATbUz31mpLGrre8RzZn YRakyGmBnUw4/w9SaTPHQRphiJ6Fs3Np2IjOgeClTZs/q7+JRyscNPJeRqN/BUL4T5QSshSZOmpxw jclebeuPnofiqUtlMz13rULVuN2W50Qh4kxCqwDCYoC6tzMt37D7vWC/pOMXV8649X9LCPjJ8hBvq sSgZAU/Pyb8gLIhHRMeqvw==; In-Reply-To: <9dfe6be4-afa8-430e-a45e-e651c479cb81@gutov.dev> (message from Dmitry Gutov on Wed, 17 Jan 2024 06:25:34 +0200) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:278381 Archived-At: > Date: Wed, 17 Jan 2024 06:25:34 +0200 > From: Dmitry Gutov > > 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.