From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 15 Mar 2017 19:45:53 +0000 (+0100)
Subject: patch 8.0.0459: old fix for :move and folding no longer needed
X-Git-Tag: v8.0.0459
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe70c5198336dba7e8b0fa915e6c4350e7f80f6f;p=vim

patch 8.0.0459: old fix for :move and folding no longer needed

Problem:    Old fix for :move messing up folding no longer needed, now that we
            have a proper solution.
Solution:   Revert patch 7.4.700. (Christian Brabandt)
---

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 897730274..df35f52da 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -799,16 +799,8 @@ do_move(linenr_T line1, linenr_T line2, linenr_T dest)
     linenr_T	num_lines;  /* Num lines moved */
     linenr_T	last_line;  /* Last line in file after adding new text */
 #ifdef FEAT_FOLDING
-    int		isFolded;
     win_T	*win;
     tabpage_T	*tp;
-
-    /* Moving lines seems to corrupt the folds, delete folding info now
-     * and recreate it when finished.  Don't do this for manual folding, it
-     * would delete all folds. */
-    isFolded = hasAnyFolding(curwin) && !foldmethodIsManual(curwin);
-    if (isFolded)
-	deleteFoldRecurse(&curwin->w_folds);
 #endif
 
     if (dest >= line1 && dest < line2)
@@ -918,12 +910,6 @@ do_move(linenr_T line1, linenr_T line2, linenr_T dest)
     else
 	changed_lines(dest + 1, 0, line1 + num_lines, 0L);
 
-#ifdef FEAT_FOLDING
-    /* recreate folds */
-    if (isFolded)
-	foldUpdateAll(curwin);
-#endif
-
     return OK;
 }
 
diff --git a/src/version.c b/src/version.c
index 2e211984f..b907c7531 100644
--- 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 */
+/**/
+    459,
 /**/
     458,
 /**/