Mercurial > vim
changeset 11123:9bfc9d7b07a7 v8.0.0449
patch 8.0.0449: part of fold patch accidentally included
commit https://github.com/vim/vim/commit/abb4d5f73fd97d8f3c3e32311959929820e74b54
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Mar 12 18:32:32 2017 +0100
patch 8.0.0449: part of fold patch accidentally included
Problem: Part of fold patch accidentally included.
Solution: Revert that part of the patch.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 12 Mar 2017 18:45:04 +0100 |
| parents | e9c5c7fde091 |
| children | 9516a30abf29 |
| files | src/ex_cmds.c src/version.c |
| diffstat | 2 files changed, 8 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -851,41 +851,24 @@ do_move(linenr_T line1, linenr_T line2, * 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