patch 8.0.0449: part of fold patch accidentally included

Problem:    Part of fold patch accidentally included.
Solution:   Revert that part of the patch.

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 05575ef70cdfebd73ed8f0d373a177eb80e71093..386183d68258f0f5d02c39841b17e719e2d88f68 100644 (file)
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -851,41 +851,24 @@ do_move(linenr_T line1, linenr_T line2, linenr_T dest)
      * their final destination at the new text position -- webb
      */
     last_line = curbuf->b_ml.ml_line_count;
-    mark_adjust_nofold(line1, line2, last_line - line2, 0L);
+    mark_adjust(line1, line2, last_line - line2, 0L);
+    changed_lines(last_line - num_lines + 1, 0, last_line + 1, num_lines);
     if (dest >= line2)
     {
-       mark_adjust_nofold(line2 + 1, dest, -num_lines, 0L);
-#ifdef FEAT_FOLDING
-       win_T       *win;
-       tabpage_T   *tp;
-
-       FOR_ALL_TAB_WINDOWS(tp, win) {
-           if (win->w_buffer == curbuf)
-               foldSwapRange(&win->w_folds, line1, line2, dest + 1,
-                       dest + num_lines);
-       }
-#endif
+       mark_adjust(line2 + 1, dest, -num_lines, 0L);
        curbuf->b_op_start.lnum = dest - num_lines + 1;
        curbuf->b_op_end.lnum = dest;
     }
     else
     {
-       mark_adjust_nofold(dest + 1, line1 - 1, num_lines, 0L);
-#ifdef FEAT_FOLDING
-       win_T       *win;
-       tabpage_T   *tp;
-
-       FOR_ALL_TAB_WINDOWS(tp, win) {
-           if (win->w_buffer == curbuf)
-               foldSwapRange(&win->w_folds, dest + 1, line1 - 1, line1, line2);
-       }
-#endif
+       mark_adjust(dest + 1, line1 - 1, num_lines, 0L);
        curbuf->b_op_start.lnum = dest + 1;
        curbuf->b_op_end.lnum = dest + num_lines;
     }
     curbuf->b_op_start.col = curbuf->b_op_end.col = 0;
-    mark_adjust_nofold(last_line - num_lines + 1, last_line,
+    mark_adjust(last_line - num_lines + 1, last_line,
                                             -(last_line - dest - extra), 0L);
+    changed_lines(last_line - num_lines + 1, 0, last_line + 1, -extra);
 
     /*
      * Now we delete the original text -- webb

diff --git a/src/version.c b/src/version.c
index 7e4d0fee5c7babf84cad55d7d63b9d6ed2fdcc73..54df7061c7d210208aaccaea7d4830d41ff515cd 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    449,
 /**/
     448,
 /**/