From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Konstantin Kharlamov Newsgroups: gmane.emacs.bugs Subject: bug#50761: [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> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="1941"; mail-complaints-to="usenet@ciao.gmane.io" To: 50761@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Sep 23 17:44:53 2021 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 1mTQu4-0000K8-Tv for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 23 Sep 2021 17:44:52 +0200 Original-Received: from localhost ([::1]:43350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mTQu2-00040M-Tr for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 23 Sep 2021 11:44:51 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:46222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTQqP-0008Ct-DN for bug-gnu-emacs@gnu.org; Thu, 23 Sep 2021 11:41:07 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:43993) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mTQqM-0004Az-Gr for bug-gnu-emacs@gnu.org; Thu, 23 Sep 2021 11:41:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mTQqM-0000j8-Ee for bug-gnu-emacs@gnu.org; Thu, 23 Sep 2021 11:41:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Konstantin Kharlamov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 23 Sep 2021 15:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50761 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.16324116072632 (code B ref -1); Thu, 23 Sep 2021 15:41:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 23 Sep 2021 15:40:07 +0000 Original-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 Original-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 Original-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 Original-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 Original-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) Original-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) Original-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 Original-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) X-Mailer: git-send-email 2.33.0 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-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" Xref: news.gmane.io gmane.emacs.bugs:215193 Archived-At: * 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