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.

diff --git a/src/memline.c b/src/memline.c
index 547b55089278f4e5a8898a165217499ce9a0088e..8201a01206f4cc722472f57d589f5887d4a73e69 100644 (file)
--- 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;
                }
            }

diff --git a/src/testdir/Make_amiga.mak b/src/testdir/Make_amiga.mak
index 4ca0594e722268ddb45e9b24e33cce4d8e371755..7eae20cfe5905273706b4156cdf1c401c6e4eb61 100644 (file)
--- a/src/testdir/Make_amiga.mak
+++ b/src/testdir/Make_amiga.mak
@@ -28,7 +28,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.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

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 5cb220fcd73fd30e8cd94cf9677cd14a9aac65a2..3c221d03e1baed1423eb8d37b247735e92cc3c44 100644 (file)
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -28,7 +28,7 @@ SCRIPTS =     test3.out test4.out test5.out test6.out test7.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
 

diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index e2847d92dff6cfc3f69329bbdeb61b968fa75af8..1735062a26bb45c90c024d38b3fff77bbeee9b94 100644 (file)
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -48,7 +48,7 @@ SCRIPTS =     test3.out test4.out test5.out test6.out test7.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
 

diff --git a/src/testdir/Make_os2.mak b/src/testdir/Make_os2.mak
index 9bfd3b57dd7e61a1cd1af715315a0905f69eba7d..82e07f45493ff89d12d229b0f3493ea0cb8c2bb8 100644 (file)
--- a/src/testdir/Make_os2.mak
+++ b/src/testdir/Make_os2.mak
@@ -28,7 +28,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.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
 

diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index dfe0e9b2186845d23faf053b7962b15140765e09..7702b98017633050559f8b62c9cac14c722e714f 100644 (file)
--- 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  test4.out  test5.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

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index b840a21341aa35f01a61dc720defd7819601f27e..7a2a09fb3463129df0fece8a02fea5aa7f9dbd28 100644 (file)
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -25,7 +25,7 @@ SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.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
 

diff --git a/src/version.c b/src/version.c
index e9c2582238e58f0016372da684c30ff41400d9d4..923380a492dfa5a18f1d798d8ca0d1bad262e595 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    216,
 /**/
     215,
 /**/