GNU bug report logs - #1536
diff-mode for git patches problem

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.

Package: emacs; Severity: wishlist; Reported by: Dmitriy Blinov <bda@HIDDEN>; merged with #1537; dated Thu, 11 Dec 2008 13:00:02 UTC; Maintainer for emacs is bug-gnu-emacs@HIDDEN.
Severity set to `wishlist' from `normal' Request was from Stefan Monnier <monnier@HIDDEN> to control@HIDDEN. Full text available.
Merged 1536 1537. Request was from Glenn Morris <rgm@HIDDEN> to control@HIDDEN. Full text available.

Message received at (unknown):


Received: (at unknown) by unknown; unknown
X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02
	(2007-08-08) on rzlab.ucr.edu
X-Spam-Level: 
X-Spam-Bayes: score:0.0227 Tokens: new, 58; hammy, 29; neutral, 65; spammy, 4.
	spammytokens:0.998-1--H*M:spb, 0.998-1--H*MI:spb, 0.997-1--H*F:D*spb.ru,
	0.987-1--malformed hammytokens:0.000-+--emacs, 0.000-+--diff, 0.001-+--100644,
	 0.003-3--deletions, 0.004-2--insertions
X-Spam-Status: No, score=-6.0 required=4.0 tests=BAYES_05,MURPHY_DRUGS_REL8,
	RCVD_IN_DNSWL_MED autolearn=ham version=3.2.3-bugs.debian.org_2005_01_02
Received: (at submit) by emacsbugs.donarmstrong.com; 11 Dec 2008 12:51:40 +0000
Received: from lists.gnu.org (lists.gnu.org [199.232.76.165])
	by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id mBBCpamo011635
	for <submit@HIDDEN>; Thu, 11 Dec 2008 04:51:38 -0800
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LAl0y-0001fj-G6
	for bug-gnu-emacs@HIDDEN; Thu, 11 Dec 2008 07:51:36 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LAl0w-0001cr-Ls
	for bug-gnu-emacs@HIDDEN; Thu, 11 Dec 2008 07:51:35 -0500
Received: from [199.232.76.173] (port=46006 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1LAl0w-0001cU-Ds
	for bug-gnu-emacs@HIDDEN; Thu, 11 Dec 2008 07:51:34 -0500
Received: from mail.mnsspb.ru ([84.204.75.2]:60765)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60)
	(envelope-from <bda@HIDDEN>)
	id 1LAl0v-0000hk-Kp
	for bug-gnu-emacs@HIDDEN; Thu, 11 Dec 2008 07:51:34 -0500
Received: from [192.168.0.114]
	by mail.mnsspb.ru with esmtps id 1LAkzw-0000GO-Rp
	for <bug-gnu-emacs@HIDDEN>; Thu, 11 Dec 2008 15:50:33 +0300
Message-ID: <49410CA4.8000800@HIDDEN>
Date: Thu, 11 Dec 2008 15:50:44 +0300
From: Dmitriy Blinov <bda@HIDDEN>
User-Agent: Mozilla-Thunderbird 2.0.0.17 (X11/20081018)
MIME-Version: 1.0
To: bug-gnu-emacs@HIDDEN
Subject: diff-mode for git patches problem
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6

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
-- 
1.5.6.5


The last but one line is two minuses by default. And diff-mode 
recognizes  first minus as  deleted  string.
Therefore  when we change some strings in patch, emacs creates malformed 
hunk offset.
It will be @@ -6,8 +6,7 @@ insead of correct @@ -6,7 +6,7 @@ after patch 
edition (if we don't delete/create strings).





Acknowledgement sent to Dmitriy Blinov <bda@HIDDEN>:
New bug report received and forwarded. Copy sent to Emacs Bugs <bug-gnu-emacs@HIDDEN>. Full text available.
Report forwarded to bug-submit-list@HIDDEN, Emacs Bugs <bug-gnu-emacs@HIDDEN>:
bug#1536; Package emacs. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Fri, 31 Oct 2014 17:00:04 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.