From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.bugs Subject: bug#1536: bug#1537: diff-mode for git patches trouble Date: Sun, 16 Aug 2020 10:00:02 -0700 Message-ID: References: <494110EB.3040600@mns.spb.ru> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="3270"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: 1537@debbugs.gnu.org, 1536@debbugs.gnu.org To: Dmitriy Blinov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Aug 16 19:01:10 2020 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 1k7M1u-0000jr-PA for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 16 Aug 2020 19:01:10 +0200 Original-Received: from localhost ([::1]:43714 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7M1t-0005Kb-6e for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 16 Aug 2020 13:01:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:41456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7M1m-0005KI-4W for bug-gnu-emacs@gnu.org; Sun, 16 Aug 2020 13:01:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:46794) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7M1l-0005gd-Q3 for bug-gnu-emacs@gnu.org; Sun, 16 Aug 2020 13:01:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k7M1l-0000V6-N1 for bug-gnu-emacs@gnu.org; Sun, 16 Aug 2020 13:01:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 16 Aug 2020 17:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 1536 X-GNU-PR-Package: emacs Original-Received: via spool by 1536-submit@debbugs.gnu.org id=B1536.159759721231449 (code B ref 1536); Sun, 16 Aug 2020 17:01:01 +0000 Original-Received: (at 1536) by debbugs.gnu.org; 16 Aug 2020 17:00:12 +0000 Original-Received: from localhost ([127.0.0.1]:58338 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k7M0x-0008Aq-LR for submit@debbugs.gnu.org; Sun, 16 Aug 2020 13:00:11 -0400 Original-Received: from mail-yb1-f193.google.com ([209.85.219.193]:33206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k7M0u-0007zH-TY; Sun, 16 Aug 2020 13:00:10 -0400 Original-Received: by mail-yb1-f193.google.com with SMTP id p191so8136426ybg.0; Sun, 16 Aug 2020 10:00:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:in-reply-to:references:user-agent :mime-version:date:message-id:subject:to:cc; bh=K6ojQVl8CkxaBqT/Hxwvyad7RCiKwtIcJWPKxomCg94=; b=CMrccYUtlhQGMkeg7OpzZle9MbhTvjNnaqC+FtG8gvS/zCVG4esPdAYAj7HJxVIzrC 6lh7VKSo/Oi5xqm5KB5LMROCawuXn5/FuHBWAXnYOmAQepmgrJv97/jdJTlbrc+T0n4X OEu3wtiJsO5klZenKN9oj6BLLhPwNU/nl9lf5Zklbllh4ZHKeAQvi1D9SCLYWxEm1MjO JoAJ8cs74RlC3+M8vVMrgLL6LVjOrp1G3jzPyWagdQNxhXCbgGO25QOpxKRPlTBmbIZA 1JDBWZxX4Z6HeYP3x5Z2BkKS1q1uVgBsT/3xJ52HX0u8ivJaUyml3IsOeviiDOA1TbGL AAVw== X-Gm-Message-State: AOAM533zGlSXr3xIvaYQqWoPi3NbJD5VoOkZ6Uf+CW418Su2aX/BkrmR 1WJfImqWSW7MU21a0CopBTip5MBdjdngs7twJRwGJ89rtSQ= X-Google-Smtp-Source: ABdhPJyvk+3tYqVcAw1Smgs1j4yXobk/QQPZE5r7M3c57tuAaBWnc5wJV615XXBgbcWlsmlSbIRTuqQ0mQta4CTkOz8= X-Received: by 2002:a25:9843:: with SMTP id k3mr15964898ybo.466.1597597203228; Sun, 16 Aug 2020 10:00:03 -0700 (PDT) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Sun, 16 Aug 2020 10:00:02 -0700 In-Reply-To: <494110EB.3040600@mns.spb.ru> (Dmitriy Blinov's message of "Thu, 11 Dec 2008 16:08:59 +0300") 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:185312 Archived-At: Dmitriy Blinov writes: > There is the problem then I'm trying to edit git-generated patches in > emacs diff-mode. > > git patches look like: > --- > hello.txt | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/hello.txt b/hello.txt > index 55bf894..25a09cc 100644 > --- a/hello.txt > +++ b/hello.txt > @@ -6,7 +6,7 @@ > 5 > 6 > 7 > -8 > +8 8 > 9 > 10 > 11 (That was 11 years ago.) I can't reproduce this on current master. The numbers seem to update correctly, as ar as I'm understanding from: https://stackoverflow.com/questions/6508651/what-do-the-numbers-on-a-git-diff-header-mean It would be useful if someone could double check this finding in case there is something I'm missing. It could be quickly verified using: git format-patch -1 ; ./src/emacs -Q *patch And then edit any line in a patch to see if the numbers update correctly. Best regards, Stefan Kangas