Mercurial > vim
changeset 2885:eb6c70460702 v7.3.216
updated for version 7.3.216
Problem: When recovering a file a range of lines is missing. (Charles Jie)
Solution: Reset the index when advancing to the next pointer block. Add a
test to verify recovery works.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Mon, 13 Jun 2011 01:07:27 +0200 |
| parents | 89ff10e5975f |
| children | 0c9ba5594d9a |
| files | src/memline.c src/testdir/Make_amiga.mak src/testdir/Make_dos.mak src/testdir/Make_ming.mak src/testdir/Make_os2.mak src/testdir/Make_vms.mms src/testdir/Makefile src/version.c |
| diffstat | 8 files changed, 12 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/memline.c +++ b/src/memline.c @@ -1507,6 +1507,7 @@ ml_recover() bnum = pp->pb_pointer[idx].pe_bnum; line_count = pp->pb_pointer[idx].pe_line_count; page_count = pp->pb_pointer[idx].pe_page_count; + idx = 0; continue; } }
--- a/src/testdir/Make_amiga.mak +++ b/src/testdir/Make_amiga.mak @@ -28,7 +28,7 @@ SCRIPTS = test1.out test3.out test4.out test61.out test62.out test63.out test64.out test65.out \ test66.out test67.out test68.out test69.out test70.out \ test71.out test72.out test73.out test74.out test75.out \ - test76.out test77.out + test76.out test77.out test78.out .SUFFIXES: .in .out @@ -125,3 +125,4 @@ test74.out: test74.in test75.out: test75.in test76.out: test76.in test77.out: test77.in +test78.out: test78.in
--- a/src/testdir/Make_dos.mak +++ b/src/testdir/Make_dos.mak @@ -28,7 +28,7 @@ SCRIPTS = test3.out test4.out test5.out test37.out test38.out test39.out test40.out test41.out \ test42.out test52.out test65.out test66.out test67.out \ test68.out test69.out test71.out test72.out test73.out \ - test74.out test75.out test76.out test77.out + test74.out test75.out test76.out test77.out test78.out SCRIPTS32 = test50.out test70.out
--- a/src/testdir/Make_ming.mak +++ b/src/testdir/Make_ming.mak @@ -48,7 +48,7 @@ SCRIPTS = test3.out test4.out test5.out test37.out test38.out test39.out test40.out test41.out \ test42.out test52.out test65.out test66.out test67.out \ test68.out test69.out test71.out test72.out test73.out \ - test74.out test75.out test76.out test77.out + test74.out test75.out test76.out test77.out test78.out SCRIPTS32 = test50.out test70.out
--- a/src/testdir/Make_os2.mak +++ b/src/testdir/Make_os2.mak @@ -28,7 +28,7 @@ SCRIPTS = test1.out test3.out test4.out test61.out test62.out test63.out test64.out test65.out \ test66.out test67.out test68.out test69.out test70.out \ test71.out test72.out test73.out test74.out test75.out \ - test76.out test77.out + test76.out test77.out test78.out .SUFFIXES: .in .out
--- a/src/testdir/Make_vms.mms +++ b/src/testdir/Make_vms.mms @@ -4,7 +4,7 @@ # Authors: Zoltan Arpadffy, <arpadffy@polarhome.com> # Sandor Kopanyi, <sandor.kopanyi@mailbox.hu> # -# Last change: 2011 Mar 03 +# Last change: 2011 Jun 13 # # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64. # Edit the lines in the Configuration section below to select. @@ -75,7 +75,7 @@ SCRIPT = test1.out test2.out test3.out test61.out test62.out test63.out test64.out test65.out \ test66.out test67.out test68.out test69.out \ test71.out test72.out test74.out test75.out test76.out \ - test77.out + test77.out test78.out # Known problems: # Test 30: a problem around mac format - unknown reason
--- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -25,7 +25,7 @@ SCRIPTS = test1.out test2.out test3.out test59.out test60.out test61.out test62.out test63.out \ test64.out test65.out test66.out test67.out test68.out \ test69.out test70.out test71.out test72.out test73.out \ - test74.out test75.out test76.out test77.out + test74.out test75.out test76.out test77.out test78.out SCRIPTS_GUI = test16.out @@ -71,7 +71,7 @@ test1.out: test1.in fi \ else echo $* NO OUTPUT >>test.log; \ fi" -# -rm -rf X* test.ok viminfo + -rm -rf X* test.ok viminfo test49.out: test49.vim