diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-03-12 18:32:32 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-03-12 18:32:32 +0100 |
| commit | abb4d5f73fd97d8f3c3e32311959929820e74b54 (patch) | |
| tree | 5ff68c38ebd4db8be76871fd795c5e4c6b2114e9 | |
| parent | b5aedf3e228d35821591da9ae8501b61cf2e264c (diff) | |
| download | vim-git-abb4d5f73fd97d8f3c3e32311959929820e74b54.tar.gz | |
patch 8.0.0449: part of fold patch accidentally includedv8.0.0449
Problem: Part of fold patch accidentally included.
Solution: Revert that part of the patch.
| -rw-r--r-- | src/ex_cmds.c | 29 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 23 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 05575ef70..386183d68 100644 --- 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 7e4d0fee5..54df7061c 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 449, +/**/ 448, /**/ 447, |