From: Glenn Morris <rgm@gnu.org>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: emacs-devel@gnu.org
Subject: Re: diff-mode misinterprets empty lines.
Date: Sat, 05 Jan 2008 19:15:06 -0500 [thread overview]
Message-ID: <3n4pdrlshh.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <jwv3aufsul2.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Thu, 06 Dec 2007 10:39:25 -0500")
In an effort to clear FOR-RELEASE, here is a simple-minded attempt to
deal with this. It seems to fix the original problem at least.
*** diff-mode.el.~1.122.~ 2007-10-21 13:00:12.000000000 -0700
--- diff-mode.el 2008-01-05 15:58:41.000000000 -0800
***************
*** 403,409 ****
(setq style (diff-hunk-style style))
(let ((end (and (re-search-forward (case style
;; A `unified' header is ambiguous.
! (unified (concat "^[^-+# \\]\\|"
diff-file-header-re))
(context "^[^-+#! \\]")
(normal "^[^<>#\\]")
--- 403,409 ----
(setq style (diff-hunk-style style))
(let ((end (and (re-search-forward (case style
;; A `unified' header is ambiguous.
! (unified (concat "^[^-+# \\\n]\\|"
diff-file-header-re))
(context "^[^-+#! \\]")
(normal "^[^<>#\\]")
next prev parent reply other threads:[~2008-01-06 0:15 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-29 1:03 diff-mode misinterprets empty lines Richard Stallman
2007-11-29 9:26 ` David Kastrup
2007-11-29 16:09 ` Stefan Monnier
2007-12-05 7:35 ` Paul Eggert
2007-12-05 10:17 ` Jim Meyering
2007-12-05 10:58 ` David Kastrup
2007-12-05 11:27 ` Jim Meyering
2007-12-05 12:33 ` Andreas Schwab
2007-12-05 12:39 ` Jim Meyering
2007-12-05 14:59 ` David Kastrup
2007-12-05 17:45 ` Paul Eggert
2007-12-05 18:12 ` David Kastrup
2007-12-06 0:54 ` Paul Eggert
2007-12-06 10:11 ` Andreas Schwab
2007-12-05 21:04 ` Juanma Barranquero
2007-12-06 15:39 ` Stefan Monnier
2008-01-06 0:15 ` Glenn Morris [this message]
2008-01-06 18:09 ` Richard Stallman
2008-01-14 21:08 ` Stefan Monnier
2008-01-14 21:38 ` Glenn Morris
2008-01-14 22:46 ` Glenn Morris
2008-01-14 23:35 ` Diffs between %s and %s end here (was: diff-mode misinterprets empty lines.) Reiner Steib
2008-01-15 3:29 ` Diffs between %s and %s end here Miles Bader
2008-01-16 8:13 ` Glenn Morris
2008-01-15 0:09 ` diff-mode misinterprets empty lines Dan Nicolaescu
2008-01-29 18:37 ` Chong Yidong
2008-02-19 16:32 ` Stefan Monnier
2008-02-19 20:44 ` Stefan Monnier
2007-12-06 2:11 ` Richard Stallman
2007-12-05 17:48 ` Paul Eggert
2007-12-05 17:50 ` Jim Meyering
2007-11-29 22:31 ` Richard Stallman
2007-11-29 23:12 ` David Kastrup
2007-11-30 2:03 ` Stefan Monnier
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=3n4pdrlshh.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
/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).