From: Dmitriy Blinov <bda@mns.spb.ru>
To: bug-gnu-emacs@gnu.org
Subject: bug#1537: diff-mode for git patches trouble
Date: Thu, 11 Dec 2008 16:08:59 +0300 [thread overview]
Message-ID: <494110EB.3040600@mns.spb.ru> (raw)
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).
Is it possible to fix this harm or I should append whitespace before
"--" string always?
next reply other threads:[~2008-12-11 13:08 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-11 13:08 Dmitriy Blinov [this message]
2008-12-11 19:04 ` bug#1537: diff-mode for git patches trouble Stefan Monnier
2008-12-12 6:57 ` Dmitriy Blinov
2008-12-12 19:08 ` Stefan Monnier
2008-12-12 19:15 ` Processed: " Emacs bug Tracking System
2020-08-16 17:00 ` bug#1536: " Stefan Kangas
2020-10-14 6:08 ` bug#1537: " Lars Ingebrigtsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=494110EB.3040600@mns.spb.ru \
--to=bda@mns.spb.ru \
--cc=1537@emacsbugs.donarmstrong.com \
--cc=bug-gnu-emacs@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.