On 06/15/2013 03:10 PM, Bram Moolenaar wrote:
Patch 7.3.1196
Problem: Old regexp engine does not match pattern with backref correctly.
(Dominique Pelle)
Solution: Fix setting status. Test multi-line patterns better.
Files: src/regexp.c, src/testdir/test64.in, src/testdir/test64.ok
This patch fails for me on Slackware Linux 64-bit:
I have gzipped all the patches and patch the source with:
# Determine VIM patchlevel:
if [ -d $CWD/patches ] ; then
cd $CWD/patches
PATCHLEVEL=$(/bin/ls ?.?.????.gz 2> /dev/null | tail -1 | cut -f 3 -d . )
if [ "$PATCHLEVEL" = "" ]; then
PATCHLEVEL=$(/bin/ls ?.?.???.gz 2> /dev/null | tail -1 | cut -f 3
-d . )
if [ "$PATCHLEVEL" = "" ]; then
PATCHLEVEL=000
fi
fi
cd $CWD
fi
for file in $CWD/patches/?.?.???.gz $CWD/patches/?.?.????.gz ; do
if [ -f $file ]; then
zcat $file | patch -p0 --verbose || exit 1
fi
done
When the patch command reaches 1196 it halts with the following output
in the terminal:
patching file src/regexp.c
Using Plan A...
Hunk #1 succeeded at 5021.
Hmm... The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|*** ../vim-7.3.1195/src/testdir/test64.in 2013-06-14
20:31:20.000000000 +0200
|--- src/testdir/test64.in 2013-06-15 15:05:03.000000000 +0200
--------------------------
patching file src/testdir/test64.in
Using Plan A...
Hunk #1 succeeded at 377.
Hunk #2 FAILED at 454.
Hunk #3 FAILED at 475.
Hunk #4 succeeded at 554.
root@hp-laptop:/home/mats/Downloads/vim#
2 out of 4 hunks FAILED -- saving rejects to file src/testdir/test64.in.rej
Hmm... The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|*** ../vim-7.3.1195/src/testdir/test64.ok 2013-06-14
20:31:20.000000000 +0
200
|--- src/testdir/test64.ok 2013-06-15 15:05:06.000000000 +0200
--------------------------
patching file src/testdir/test64.ok
Using Plan A...
Hunk #1 succeeded at 857.
Hunk #2 succeeded at 913.
Hmm... The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|*** ../vim-7.3.1195/src/version.c 2013-06-14 22:48:50.000000000 +0200
|--- src/version.c 2013-06-15 14:12:46.000000000 +0200
--------------------------
patching file src/version.c
Using Plan A...
Hunk #1 succeeded at 730.patching file src/regexp.c
Using Plan A...
Hunk #1 succeeded at 5021.
Hmm... The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|*** ../vim-7.3.1195/src/testdir/test64.in 2013-06-14
20:31:20.000000000 +0200
|--- src/testdir/test64.in 2013-06-15 15:05:03.000000000 +0200
--------------------------
patching file src/testdir/test64.in
Using Plan A...
Hunk #1 succeeded at 377.
Hunk #2 FAILED at 454.
Hunk #3 FAILED at 475.
Hunk #4 succeeded at 554.
root@hp-laptop:/home/mats/Downloads/vim#
2 out of 4 hunks FAILED -- saving rejects to file src/testdir/test64.in.rej
Hmm... The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|*** ../vim-7.3.1195/src/testdir/test64.ok 2013-06-14
20:31:20.000000000 +0
200
|--- src/testdir/test64.ok 2013-06-15 15:05:06.000000000 +0200
--------------------------
patching file src/testdir/test64.ok
Using Plan A...
Hunk #1 succeeded at 857.
Hunk #2 succeeded at 913.
Hmm... The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|*** ../vim-7.3.1195/src/version.c 2013-06-14 22:48:50.000000000 +0200
|--- src/version.c 2013-06-15 14:12:46.000000000 +0200
--------------------------
patching file src/version.c
Using Plan A...
Hunk #1 succeeded at 730.
done
Anybody else experiencing this?
Regards,
Mats Tegner
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups "vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
