updated for version 7.4.634

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

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

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 \

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 \

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 \

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 \

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 \

src/undo.c

@@ -2847,10 +2847,13 @@ u_undoredo(undo)
      * restore marks from before undo/redo
      */
     for (i = 0; i < NMARKS; ++i)
-	if (curhead->uh_namedm[i].lnum != 0)
     {
+	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)
     {

src/version.c

@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    634,
 /**/
     633,
 /**/