all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Chong Yidong <cyd@stupidchicken.com>
Cc: emacs-devel@gnu.org
Subject: Re: diff-mode misinterprets empty lines.
Date: Tue, 19 Feb 2008 11:32:05 -0500	[thread overview]
Message-ID: <jwvd4qsncfo.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <87odb41nru.fsf@stupidchicken.com> (Chong Yidong's message of "Tue, 29 Jan 2008 13:37: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.
>> 
>> It is problematic when you try to apply a hunk via C-c C-a because any
>> empty line following your hunk (e.g. the last hunk in a C-x v =) will be
>> taken as being part of the hunk and C-c C-a will think that the original
>> text was just missing a newline and will add it (as a result of its
>> fuzzy matching feature).

> Is there any progress on this issue, or is help needed?

No progress.  Help would be welcome.  I think it mostly involves trying
to use diff-sanity-checks (either the function itself or the ideas) at
more places.

E.g. diff-end-of-hunk should check that the place it found is consistent
with the hunk header's numbers and if not (and if looking at an empty
line) keep going further.

But be careful also that diff-end-of-hunk (and other functions) is/are
used in diff-fixup-modifs where the hunk header is presumed broken.

> It seems to me that this is the last bug remaining the FOR-RELEASE,
> although the release process is so opaque and confusing that I have
> little idea what's going on.

It was decided that this bug should not prevent the pretest.  I would
personally not hold the release for it either, so we already have
diff-sanity-checks which takes care of the most serious problems already.


        Stefan




  reply	other threads:[~2008-02-19 16:32 UTC|newest]

Thread overview: 35+ 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
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 [this message]
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
  -- strict thread matches above, loose matches on Subject: below --
2007-11-27 18:04 Sergei Organov

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=jwvd4qsncfo.fsf-monnier+emacs@gnu.org \
    --to=monnier@iro.umontreal.ca \
    --cc=cyd@stupidchicken.com \
    --cc=emacs-devel@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.