From unknown Wed Jun 18 00:27:54 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#50761 <50761@debbugs.gnu.org> To: bug#50761 <50761@debbugs.gnu.org> Subject: Status: [PATCH] Do not count git markers as "deleted lines" Reply-To: bug#50761 <50761@debbugs.gnu.org> Date: Wed, 18 Jun 2025 07:27:54 +0000 retitle 50761 [PATCH] Do not count git markers as "deleted lines" reassign 50761 emacs submitter 50761 Konstantin Kharlamov severity 50761 normal tag 50761 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 23 11:40:07 2021 Received: (at submit) by debbugs.gnu.org; 23 Sep 2021 15:40:07 +0000 Received: from localhost ([127.0.0.1]:55509 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTQpT-0000gO-3k for submit@debbugs.gnu.org; Thu, 23 Sep 2021 11:40:07 -0400 Received: from lists.gnu.org ([209.51.188.17]:38954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTQpR-0000gE-2I for submit@debbugs.gnu.org; Thu, 23 Sep 2021 11:40:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43972) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTQpQ-0006hW-Lf for bug-gnu-emacs@gnu.org; Thu, 23 Sep 2021 11:40:04 -0400 Received: from forward108o.mail.yandex.net ([2a02:6b8:0:1a2d::206]:59962) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTQpM-0002h7-1B for bug-gnu-emacs@gnu.org; Thu, 23 Sep 2021 11:40:03 -0400 Received: from forward102q.mail.yandex.net (forward102q.mail.yandex.net [IPv6:2a02:6b8:c0e:1ba:0:640:516:4e7d]) by forward108o.mail.yandex.net (Yandex) with ESMTP id 8E5C35DD495B for ; Thu, 23 Sep 2021 18:39:47 +0300 (MSK) Received: from vla1-4834b80a1080.qloud-c.yandex.net (vla1-4834b80a1080.qloud-c.yandex.net [IPv6:2a02:6b8:c0d:1e06:0:640:4834:b80a]) by forward102q.mail.yandex.net (Yandex) with ESMTP id 89FC2BF00002 for ; Thu, 23 Sep 2021 18:39:47 +0300 (MSK) Received: from vla5-47b3f4751bc4.qloud-c.yandex.net (vla5-47b3f4751bc4.qloud-c.yandex.net [2a02:6b8:c18:3508:0:640:47b3:f475]) by vla1-4834b80a1080.qloud-c.yandex.net (mxback/Yandex) with ESMTP id yzyzew0rZP-dlEi3Bsr; Thu, 23 Sep 2021 18:39:47 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1632411587; bh=PSXh+3+sq951bs+ZcMpsSuKYJa6g/TurpGz/JRKelxI=; h=Message-Id:Date:Subject:To:From; b=o0VdyaphrIaW25y2RqBARF1oQTC4Kz2sil9A+fCzlZoP2Gg/ag5b0DH6D5hnX4t/a YN/Yo9eJd9TzrUWR0Kyn40Gbnq65nadnHCgSKpJc95LI4e2MPmfjuvx8cqwax7Ar+0 do4qB8wjmyC4qt1kLJwVaF6iqzbVaNQBp8t0DvTE= Authentication-Results: vla1-4834b80a1080.qloud-c.yandex.net; dkim=pass header.i=@yandex.ru Received: by vla5-47b3f4751bc4.qloud-c.yandex.net (smtp/Yandex) with ESMTPSA id DUz4J9Q01z-dl0Wigru; Thu, 23 Sep 2021 18:39:47 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) From: Konstantin Kharlamov To: bug-gnu-emacs@gnu.org Subject: [PATCH] Do not count git markers as "deleted lines" Date: Thu, 23 Sep 2021 18:39:42 +0300 Message-Id: <20210923153942.215570-1-Hi-Angel@yandex.ru> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a02:6b8:0:1a2d::206; envelope-from=Hi-Angel@yandex.ru; helo=forward108o.mail.yandex.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.0 (/) 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: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * lisp/vc/diff-mode.el (diff-fixup-modifs): skip "end of patch" markers that `git-format-patch` leaves around. --- lisp/vc/diff-mode.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 0852f8790e9..75bb4dee1ae 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -1355,7 +1355,10 @@ diff-fixup-modifs (pcase (char-after) (?\s (cl-incf space)) (?+ (cl-incf plus)) - (?- (cl-incf minus)) + (?- (unless ;; in git diff "^-- $" signifies end of patch + (and (eq diff-buffer-type 'git) + (looking-at "^-- $")) + (cl-incf minus))) (?! (cl-incf bang)) ((or ?\\ ?#) nil) (?\n (if diff-valid-unified-empty-line -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 23 17:26:28 2021 Received: (at 50761) by debbugs.gnu.org; 23 Sep 2021 21:26:28 +0000 Received: from localhost ([127.0.0.1]:56061 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTWEd-0004eI-Kt for submit@debbugs.gnu.org; Thu, 23 Sep 2021 17:26:28 -0400 Received: from quimby.gnus.org ([95.216.78.240]:48060) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTWET-0004de-2b for 50761@debbugs.gnu.org; Thu, 23 Sep 2021 17:26:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=sb+h8BJnToRghUm5i5Qjlhlm9FElkrlfWXTTboBLWw8=; b=CZJoZsBFK4ah+7ktBlyYqoVRvf H4wLFBo3tcesaQ/57j7lUHAGx0P0+NAyNRdvNN7GrwSiyYUdtEW/QpKxfM18R+D58ZDrqKkS4whxf hqyEHdaa2cB3GfNUzzCLeW0R89RozZglochSWWbTFrpO4++zpWqkCOutNaHYYLu7aU3M=; Received: from [84.212.220.105] (helo=elva) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mTWEI-00074G-33; Thu, 23 Sep 2021 23:26:10 +0200 From: Lars Ingebrigtsen To: Konstantin Kharlamov Subject: Re: bug#50761: [PATCH] Do not count git markers as "deleted lines" References: <20210923153942.215570-1-Hi-Angel@yandex.ru> X-Now-Playing: Magnus Granberg & Skogen's _Let Pass My Weary Guiltless Ghost_: "Let Pass My Weary Guiltless Ghost" Date: Thu, 23 Sep 2021 23:26:05 +0200 In-Reply-To: <20210923153942.215570-1-Hi-Angel@yandex.ru> (Konstantin Kharlamov's message of "Thu, 23 Sep 2021 18:39:42 +0300") Message-ID: <87wnn7vv9u.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.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 @@CONTACT_ADDRESS@@ for details. Content preview: Konstantin Kharlamov writes: > * lisp/vc/diff-mode.el (diff-fixup-modifs): skip "end of patch" markers > that `git-format-patch` leaves around. Looks good to me, so I've pushed it to Emacs 28 (with a change in the comment). Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 50761 Cc: 50761@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 (---) Konstantin Kharlamov writes: > * lisp/vc/diff-mode.el (diff-fixup-modifs): skip "end of patch" markers > that `git-format-patch` leaves around. Looks good to me, so I've pushed it to Emacs 28 (with a change in the comment). -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 23 17:26:23 2021 Received: (at control) by debbugs.gnu.org; 23 Sep 2021 21:26:23 +0000 Received: from localhost ([127.0.0.1]:56059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTWEZ-0004e4-CJ for submit@debbugs.gnu.org; Thu, 23 Sep 2021 17:26:23 -0400 Received: from quimby.gnus.org ([95.216.78.240]:48074) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTWEX-0004dm-Hk for control@debbugs.gnu.org; Thu, 23 Sep 2021 17:26:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Subject:From:To:Message-Id:Date:Sender:Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Led26+24A3EtAhp5+UTtToWBqc7KfdFwl15qQ0jQU4g=; b=aa0i9RtqrF8vtY7X+ZqJA6ioAO MZz+TT6QNJRBBkGpjYzqR4Q9vx9gBNUggwHi3jjDPZ+JwDM2cQfsXuJgxXb4/ubRe579fHj1T1+9n supgESBp3P7fMOlZ3WsPN8P+ORAS9yeqWcIGGA90GIJKlMjvrKvn2DYDQnaaqH7o3N+4=; Received: from [84.212.220.105] (helo=elva) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mTWEP-00074T-HU for control@debbugs.gnu.org; Thu, 23 Sep 2021 23:26:15 +0200 Date: Thu, 23 Sep 2021 23:26:12 +0200 Message-Id: <87v92rvv9n.fsf@gnus.org> To: control@debbugs.gnu.org From: Lars Ingebrigtsen Subject: control message for bug #50761 X-Spam-Report: Spam detection software, running on the system "quimby.gnus.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 @@CONTACT_ADDRESS@@ for details. Content preview: close 50761 28.1 quit Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control 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 (---) close 50761 28.1 quit From unknown Wed Jun 18 00:27:54 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 22 Oct 2021 11:24:07 +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