updated for version 7.4.634

Problem:    Marks are not restored after redo + undo.
Solution:   Fix the way marks are restored. (Olaf Dabrunz)

diff --git a/src/testdir/Make_amiga.mak b/src/testdir/Make_amiga.mak
index 0e9898b9ad16bad83463134071041ebaf247c8b3..2567d52e75ae0008d79310d86075f2cdc62e04cb 100644 (file)
--- a/src/testdir/Make_amiga.mak
+++ b/src/testdir/Make_amiga.mak
@@ -48,6 +48,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
                test_listlbr.out \
                test_listlbr_utf8.out \
                test_mapping.out \
+               test_marks.out \
                test_nested_function.out \
                test_options.out \
                test_qf_title.out \
@@ -188,6 +189,7 @@ test_insertcount.out: test_insertcount.in
 test_listlbr.out: test_listlbr.in
 test_listlbr_utf8.out: test_listlbr_utf8.in
 test_mapping.out: test_mapping.in
+test_marks.out: test_marks.in
 test_nested_function.out: test_nested_function.in
 test_options.out: test_options.in
 test_qf_title.out: test_qf_title.in

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 1ba440718d556aa59af0b65e5a98a239ea73a375..51574deeb8ea5eafa1ba6fba144606063567ff76 100644 (file)
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -47,6 +47,7 @@ SCRIPTS =     test3.out test4.out test5.out test6.out test7.out \
                test_listlbr.out \
                test_listlbr_utf8.out \
                test_mapping.out \
+               test_marks.out \
                test_nested_function.out \
                test_options.out \
                test_qf_title.out \

diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 51049fb620e804cfc41559afc3a6b5859adfe8d6..a907fb123a6bf886e00953dceedaf98cefdb6ae5 100644 (file)
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -69,6 +69,7 @@ SCRIPTS =     test3.out test4.out test5.out test6.out test7.out \
                test_listlbr.out \
                test_listlbr_utf8.out \
                test_mapping.out \
+               test_marks.out \
                test_nested_function.out \
                test_options.out \
                test_qf_title.out \

diff --git a/src/testdir/Make_os2.mak b/src/testdir/Make_os2.mak
index 0b3ce26e9314878098b6cee7c91fd5dc70c657cf..bab000d7c00f9539df84ac73b93e1c0b1783f1f5 100644 (file)
--- a/src/testdir/Make_os2.mak
+++ b/src/testdir/Make_os2.mak
@@ -49,6 +49,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
                test_listlbr.out \
                test_listlbr_utf8.out \
                test_mapping.out \
+               test_marks.out \
                test_nested_function.out \
                test_options.out \
                test_qf_title.out \

diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index f57bf55a6b3c23b01d374f588887427db4d5a69d..ab1e529ea0103f6f2f0f84494a8e0d40d3a195bb 100644 (file)
--- a/src/testdir/Make_vms.mms
+++ b/src/testdir/Make_vms.mms
@@ -108,6 +108,7 @@ SCRIPT = test1.out  test2.out  test3.out  test4.out  test5.out  \
         test_listlbr.out \
         test_listlbr_utf8.out \
         test_mapping.out \
+        test_marks.out \
         test_nested_function.out \
         test_options.out \
         test_qf_title.out \

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 671c30d5c32a89f59c470c6ffef78ee8bcad75f9..626c81e8d56954ec8225a059a76fb64246ae9ada 100644 (file)
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -45,6 +45,7 @@ SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
                test_listlbr.out \
                test_listlbr_utf8.out \
                test_mapping.out \
+               test_marks.out \
                test_nested_function.out \
                test_options.out \
                test_qf_title.out \

diff --git a/src/undo.c b/src/undo.c
index 24dcf0548e938cecf0a7917297d586e60a62691a..034d16c14eb0d3a99805b539595e011712fc8862 100644 (file)
--- a/src/undo.c
+++ b/src/undo.c
@@ -2847,11 +2847,14 @@ u_undoredo(undo)
      * restore marks from before undo/redo
      */
     for (i = 0; i < NMARKS; ++i)
+    {
        if (curhead->uh_namedm[i].lnum != 0)
-       {
            curbuf->b_namedm[i] = curhead->uh_namedm[i];
+       if (namedm[i].lnum != 0)
            curhead->uh_namedm[i] = namedm[i];
-       }
+       else
+           curhead->uh_namedm[i].lnum = 0;
+    }
     if (curhead->uh_visual.vi_start.lnum != 0)
     {
        curbuf->b_visual = curhead->uh_visual;

diff --git a/src/version.c b/src/version.c
index d2afbf500abaa171967404afa018d147a174aeb8..3d493b0545c70228beb9faeb2d73a3135fd8a608 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    634,
 /**/
     633,
 /**/