From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Sean Whitton Newsgroups: gmane.emacs.bugs Subject: bug#73387: 30.0.90; C-x v v in diff-mode doesn't work after C-c C-n Date: Sun, 22 Sep 2024 13:46:44 +0100 Message-ID: <87y13jq2iz.fsf@zephyr.silentflame.com> References: <87zfo28fzu.fsf@zephyr.silentflame.com> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="31957"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: juri@linkov.net, monnier@iro.umontreal.ca, dgutov@yandex.ru To: 73387@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Sep 22 14:48:00 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 1ssM0N-00086i-Gm for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 22 Sep 2024 14:47:59 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ssM06-0004Db-EL; Sun, 22 Sep 2024 08:47:42 -0400 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 1ssM04-0004DM-Sf for bug-gnu-emacs@gnu.org; Sun, 22 Sep 2024 08:47:40 -0400 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 1ssM04-00087D-Fv for bug-gnu-emacs@gnu.org; Sun, 22 Sep 2024 08:47:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=2t0r1+XA6IZ2SBb/988fnKuZyEiX4XlkQiiXxj8Aj/o=; b=nP0AJ674IQNtGrwOx51TQiQqv5AApeHDjFb0J/Jej2W9G7p3ZFFnhH52/UfRFKfANqRjSZfu85fRFUN8FUkkcJSkkPiDOjC261yYodL3NcUvtXmlwu9O92Rp+UeC+EEsGtqC965FMHjjDyZ0BLZVE1bwO7gWdae/eWTEQzmGAYv5FXZfJG1fkXyOWuj6Kpz79nvkuHhq/6toYMdRs9sRTRA0e4rPb7qzS4Mei3IhbwUgY5kHjJOum72yahaaVXU8VxyfIMauB/ZiQEWtASncEXh7mtrL6Ru42OHCzJC9AbLdhGrObtmLlHmFNJL24l1EtYXC0TS2ko1bqyN6oKClfg==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ssM0P-0000Lz-Pf for bug-gnu-emacs@gnu.org; Sun, 22 Sep 2024 08:48:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Sean Whitton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 22 Sep 2024 12:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73387 X-GNU-PR-Package: emacs Original-Received: via spool by 73387-submit@debbugs.gnu.org id=B73387.17270092341287 (code B ref 73387); Sun, 22 Sep 2024 12:48:01 +0000 Original-Received: (at 73387) by debbugs.gnu.org; 22 Sep 2024 12:47:14 +0000 Original-Received: from localhost ([127.0.0.1]:41067 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssLze-0000Kf-Dl for submit@debbugs.gnu.org; Sun, 22 Sep 2024 08:47:14 -0400 Original-Received: from sendmail.purelymail.com ([34.202.193.197]:52888) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssLzd-0000KN-4S for 73387@debbugs.gnu.org; Sun, 22 Sep 2024 08:47:14 -0400 DKIM-Signature: a=rsa-sha256; b=O/zSvRRJsVcgqqxlLdLGQUWu2Z+4t2uRT9xcyGQHKq9vl8Z4AJ5RtF7Vwl8kaImvsP7RPNoPaRFfr43A3EeC+hl2pGxopnMWZN80ZPfbxb16LbJ52ARrKLZji6oSbtEr0EsYhZvVIGJBVklVvCwhg8P8lr4LGXgo2mk7L/2L0X+1C1iN58pO4wEBEDyEmiZG9o4A4MujR0t0Lvn6Esa20JLVUG29hw+qBIaU/Fy3jEZB8Wl6dkTZUgief9TP2MjAzX3a9QA9f0GQD+zwpGP18VIn8htiPVR/LL4PBMbmhbR5ZBOIC6vWgCfY1RAN8uXqc44CwQzMO6vun2OleCFZwQ==; s=purelymail3; d=spwhitton.name; v=1; bh=yXYnRTrRXM+RPDeIehLHI0osYjkFucG29EyhxEi11IY=; h=Received:Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=WlUo5iBh8MR4ofjVDJGXn0fs9vKh3060ZVW03VarzjTJCVxsyfmL/oAHRQ3eE7Vn0I0LIYRDehv9Z6ez1LqsejMW5uqowYNz4LOes/CMcmhdYKaBZH7cGqUDQ0dL6BfBXsXsWbkDEasobDPdTTGxpd87JKvARZnntZUY6H3w4fxdeZPSzHrqVOjz6XuGsCTaKbqBHSSrpKG8ZcLC0H6zaR13awfKVlhUXgGQa0VcHUnuxutbX4cqHw2oeyuslU3MuM0JBWpUuFgo3dguDVex98yLRKR8L86HSvrQ0s0XEg64OWePGOLUn0S7NOjT+WkYAeJ+FdZ1NiM8I4Y+EQuOxw==; s=purelymail3; d=purelymail.com; v=1; bh=yXYnRTrRXM+RPDeIehLHI0osYjkFucG29EyhxEi11IY=; h=Feedback-ID:Received:Received:From:To:Subject:Date; Feedback-ID: 20115:3760:null:purelymail X-Pm-Original-To: 73387@debbugs.gnu.org Original-Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -1550291933; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sun, 22 Sep 2024 12:46:45 +0000 (UTC) Original-Received: by zephyr.silentflame.com (Postfix, from userid 1000) id 9B563949929; Sun, 22 Sep 2024 13:46:44 +0100 (BST) In-Reply-To: <87zfo28fzu.fsf@zephyr.silentflame.com> (Sean Whitton's message of "Fri, 20 Sep 2024 17:08:37 +0100") 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:292231 Archived-At: Hello, On Fri 20 Sep 2024 at 05:08pm +01, Sean Whitton wrote: > If you do C-c C-n in a diff-mode buffer with multiple hunks, a > subsequent C-x v v signals a user-error from diff-file-next. I think > that the bug is in how diff-vc-deduce-fileset invokes diff-file-next. > I'm not sure exactly how to rework diff-vc-deduce-fileset. > > It would be nice to fix this because then C-c C-n C-x v v would be a > convenient way to commit just a single hunk. I applied a brute force fix to diff-vc-deduce-fileset. Attempting to commit a single hunk still fails because after C-c C-n the file name header is not present, and 'git apply' can't handle a hunk without a file name header. We have diff-find-file-name to get the name; I wonder if we should try to construct a fake file header? -- Sean Whitton