From: Konstantin Kharlamov <hi-angel@yandex.ru>
To: 37395@debbugs.gnu.org
Subject: bug#37395: Diff-mode doesn't take into account patch-separators as produced by git-format-patch
Date: Fri, 13 Sep 2019 00:33:05 +0300 [thread overview]
Message-ID: <1568323985.28657.0@yandex.ru> (raw)
As title says. As a follow-up to this report I'm gonna send a fix to
this problem.
Observable result of the problem is that Emacs thinks `-- ` patch line
is a "deleted line", whereas it actually is end of the patch.
The follow-up patch I successfully used to edit patch-series of 12
patches to libinput
https://gitlab.freedesktop.org/libinput/libinput/merge_requests/288#note_223871
# Steps to reproduce
1. In terminal, go to Emacs git repository
2. Execute `git format-patch -1 --stdout > 1.patch`
3. Open 1.patch in Emacs (diff-mode should automatically get enabled)
4. Replace at the beginning of a "deleted line" the `-` with space ` `.
## Expected
The 4-digit header (which looks like `@@ -561,7 +569,8`) should have
first 2 digits (561 and 7 in example) unchanged.
## Actual
The 4-digit header increases count of 2nd digit (7 in example) by one.
next reply other threads:[~2019-09-12 21:33 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-12 21:33 Konstantin Kharlamov [this message]
2019-09-12 21:34 ` bug#37395: [PATCH] diff-mode.el: take into account patch separators Konstantin Kharlamov
2019-09-13 6:14 ` Eli Zaretskii
2019-09-13 6:58 ` Konstantin Kharlamov
2019-09-16 20:31 ` Konstantin Kharlamov
2019-09-13 9:19 ` bug#37395: [PATCH v2] " Konstantin Kharlamov
2019-09-16 20:26 ` bug#37395: [PATCH v3] " Konstantin Kharlamov
2019-10-07 4:39 ` Lars Ingebrigtsen
2019-10-07 23:04 ` Konstantin Kharlamov
2019-10-07 23:12 ` Konstantin Kharlamov
2019-10-08 15:59 ` Lars Ingebrigtsen
2019-10-08 20:08 ` Konstantin Kharlamov
2019-10-08 19:34 ` bug#37395: [PATCH v4] " Konstantin Kharlamov
2019-10-09 19:36 ` Lars Ingebrigtsen
2019-10-09 20:08 ` Konstantin Kharlamov
2019-10-09 20:07 ` bug#37395: [PATCH v5] " Konstantin Kharlamov
2019-10-13 3:53 ` 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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1568323985.28657.0@yandex.ru \
--to=hi-angel@yandex.ru \
--cc=37395@debbugs.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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).