From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#66113: Apply the entire diff buffer Date: Tue, 26 Sep 2023 02:07:33 +0300 Message-ID: <9555856c-6b67-1806-3f76-b418825f0046@gutov.dev> References: <86o7hx4a11.fsf@mail.linkov.net> <86v8c2u34b.fsf@mail.linkov.net> <9cb6c329-8a81-414a-00e0-b3d8aa73d037@gutov.dev> <86msxep69i.fsf@mail.linkov.net> <86lecwvjw4.fsf@mail.linkov.net> <095e4596-7c67-21e2-a69f-c0b7945773a3@gutov.dev> <86a5tcxbw7.fsf@mail.linkov.net> <57031fed-65d6-731b-756b-093a20065f1c@gutov.dev> <86r0mmywhb.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="29047"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Cc: 66113@debbugs.gnu.org To: Juri Linkov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Sep 26 01:08:08 2023 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 1qkugQ-0007GL-8w for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 26 Sep 2023 01:08:07 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qkugC-0006j6-8W; Mon, 25 Sep 2023 19:07:52 -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 1qkug9-0006hG-Hx for bug-gnu-emacs@gnu.org; Mon, 25 Sep 2023 19:07:49 -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 1qkug9-0006Sn-9p for bug-gnu-emacs@gnu.org; Mon, 25 Sep 2023 19:07:49 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qkugL-0003S5-LV for bug-gnu-emacs@gnu.org; Mon, 25 Sep 2023 19:08:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 25 Sep 2023 23:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66113 X-GNU-PR-Package: emacs Original-Received: via spool by 66113-submit@debbugs.gnu.org id=B66113.169568328013262 (code B ref 66113); Mon, 25 Sep 2023 23:08:01 +0000 Original-Received: (at 66113) by debbugs.gnu.org; 25 Sep 2023 23:08:00 +0000 Original-Received: from localhost ([127.0.0.1]:46874 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkugJ-0003Rq-Lm for submit@debbugs.gnu.org; Mon, 25 Sep 2023 19:07:59 -0400 Original-Received: from out3-smtp.messagingengine.com ([66.111.4.27]:57993) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkugG-0003Ra-L0 for 66113@debbugs.gnu.org; Mon, 25 Sep 2023 19:07:58 -0400 Original-Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 16E9F5C0D6D; Mon, 25 Sep 2023 19:07:37 -0400 (EDT) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Mon, 25 Sep 2023 19:07:37 -0400 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:sender:subject:subject:to:to; s=fm1; t= 1695683257; x=1695769657; bh=6KOPtB1I3alXahm0Ad8eoLZVijopiztga6h F6mrvqtw=; b=TFGVlCaOGekOryqxLywkDSzvvZZjscI00kLsdIonR1J/+kTfDQp e2SrCv4Wwi+BCgAPazhaw8RqXjBffOP+edUAbsA2TwvWwYvITSqTABNG0Snx6Prf K2HZ/7DjG2mqooa0cpH0QCYaerVwTDOa8HuvIzKtnSuGXiIkCwYcuCNAUikwZeuf YAo8zRK50mwAIlqyAJbbnjT8Xwr7tYwyEBHWBhFUjW1Puo6NLnpkQ504kKA0IGI5 0sKpRIxEAVNb64bfouiNbqG2wKvyDvLUMEB8J5YWXrAFE679RN4OnqRgFvTNGw5B GV21rjIAFSZhWwMKAMmo9YabkXZx6jvG20w== 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:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1695683257; x=1695769657; bh=6KOPtB1I3alXahm0Ad8eoLZVijopiztga6h F6mrvqtw=; b=RU7rIKPoY4x/bT2cdwZPGkIMyPGKGBEsq5TGTcGFrSbOyTZ74Q/ Y5Mo8bVvqtPCEMy9xN/UjTgOFn/fiBPgZE49ljwyUnIMHL6ERqBfMV51o8ZZDdWy WuNFCX/GA8ZEg7vdj03H9rH2ljvsP7Nof344kS80+Bm1qJ+gYuXOf9S/pm5A41cz aBBrCOnMHbSBz3UBzei46o9SITQoCFS/1RD+pU6PWdJGv+f7UOjb3UItn3lURGpI nyf0genY11pF9bi3HjwqCIh8WmRHSomam0nC+xJqIewAKsYUdhMC6QNj218Str/F Kkle5DzRnJfvv9t0DNHm7h3mHwuB0bFq2xw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrudelhedgudejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvvehfhfgjtgfgsehtjeertddtfeejnecuhfhrohhmpeffmhhi thhrhicuifhuthhovhcuoegumhhithhrhiesghhuthhovhdruggvvheqnecuggftrfgrth htvghrnhephfeutdekveeggeetteekfeejffegudduudfhueevleeftdffffeggeeivddv jeelnecuffhomhgrihhnpehgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepughmihhtrhihsehguhhtohhvrdguvghv X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 25 Sep 2023 19:07:35 -0400 (EDT) Content-Language: en-US In-Reply-To: <86r0mmywhb.fsf@mail.linkov.net> 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:271355 Archived-At: On 25/09/2023 20:49, Juri Linkov wrote: >>>> I tried testing it out too. There is a patch where the third hunk doesn't >>>> apply (errors with "can't find the text to patch" in regular usage). This >>>> command ends with cryptic "No next hunk". >>> This is what I expected that diff-hunk-next might signal an error >>> that we should catch, but still couldn't find a patch that fails >>> with such error. So I will try to construct such a patch manually. >> Try the patch attached to this message: >> https://debbugs.gnu.org/cgi/bugreport.cgi?bug=63896#5 > Thanks, I forgot about signatures in git patches. > diff-mode already handles them in diff-fixup-modifs: > > ;; In git format-patch "^-- $" signifies > ;; the end of the patch. > (and (eq diff-buffer-type 'git) > (looking-at "^-- $")) > > So I just copied this code here: That works. Thanks! Ideally, I think point would move to the first failing hunk. But that's not urgent, could be a TODO for later. Aside from that, I'm still not crazy about the binding. But that's not a technical issue.