* diff-mode fixes for empty lines in unified diffs
@ 2008-02-19 19:47 Stefan Monnier
2008-02-19 19:57 ` Juanma Barranquero
0 siblings, 1 reply; 4+ messages in thread
From: Stefan Monnier @ 2008-02-19 19:47 UTC (permalink / raw)
To: emacs-devel
I've just installed on the 22 branch some changes to make it work better
in the face of unified diffs which have empty lines. I've done a bit of
testing on it, but the change is non-trivial, so if you could all try to
break it, that would be great, thanks.
Stefan
PS: Miles, you'll probably get merge conflicts on the trunk, just send
them to me.
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: diff-mode fixes for empty lines in unified diffs
2008-02-19 19:47 diff-mode fixes for empty lines in unified diffs Stefan Monnier
@ 2008-02-19 19:57 ` Juanma Barranquero
2008-02-19 20:42 ` Stefan Monnier
0 siblings, 1 reply; 4+ messages in thread
From: Juanma Barranquero @ 2008-02-19 19:57 UTC (permalink / raw)
To: Stefan Monnier; +Cc: emacs-devel
On Feb 19, 2008 8:47 PM, Stefan Monnier <monnier@iro.umontreal.ca> wrote:
> PS: Miles, you'll probably get merge conflicts on the trunk, just send
> them to me.
Speaking of merge conflicts, the changes you did in the
EMACS_22_BASE´s vc-hooks.el to avoid the loop in vc-find-root should
be synched back to the trunk, shouldn't they? (They cause a conflict
right now.)
Juanma
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: diff-mode fixes for empty lines in unified diffs
2008-02-19 19:57 ` Juanma Barranquero
@ 2008-02-19 20:42 ` Stefan Monnier
2008-02-19 21:19 ` Juanma Barranquero
0 siblings, 1 reply; 4+ messages in thread
From: Stefan Monnier @ 2008-02-19 20:42 UTC (permalink / raw)
To: Juanma Barranquero; +Cc: emacs-devel
>> PS: Miles, you'll probably get merge conflicts on the trunk, just send
>> them to me.
> Speaking of merge conflicts, the changes you did in the
> EMACS_22_BASE´s vc-hooks.el to avoid the loop in vc-find-root should
> be synched back to the trunk, shouldn't they? (They cause a conflict
> right now.)
Yes. Haven't heard 'bout the conflict, tho, where is it?
Stefan
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: diff-mode fixes for empty lines in unified diffs
2008-02-19 20:42 ` Stefan Monnier
@ 2008-02-19 21:19 ` Juanma Barranquero
0 siblings, 0 replies; 4+ messages in thread
From: Juanma Barranquero @ 2008-02-19 21:19 UTC (permalink / raw)
To: Stefan Monnier; +Cc: emacs-devel
On Feb 19, 2008 9:42 PM, Stefan Monnier <monnier@iro.umontreal.ca> wrote:
> Yes. Haven't heard 'bout the conflict, tho, where is it?
Applying your EMACS_22_BASE patch to the trunk causes a conflict
because of this:
2008-02-19 Thien-Thi Nguyen <ttn@gnuvola.org>
* vc-hooks.el (vc-find-root): Take optional arg INVERT.
If non-nil, reverse the sense of the check.
though it is really trivial to fix.
Juanma
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-02-19 21:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-19 19:47 diff-mode fixes for empty lines in unified diffs Stefan Monnier
2008-02-19 19:57 ` Juanma Barranquero
2008-02-19 20:42 ` Stefan Monnier
2008-02-19 21:19 ` Juanma Barranquero
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).