aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 8.0.0449: part of fold patch accidentally included

Browse Source 
Problem:    Part of fold patch accidentally included.
Solution:   Revert that part of the patch.
This commit is contained in:
Bram Moolenaar
2017-03-12 18:32:32 +01:00
parent b5aedf3e22
commit abb4d5f73f
2 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/ex_cmds.c
View File

@@ -851,41 +851,24 @@ do_move(linenr_T line1, linenr_T line2, linenr_T dest)
* their final destination at the new text position -- webb * their final destination at the new text position -- webb
*/ */
last_line = curbuf->b_ml.ml_line_count; 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) if (dest >= line2)
{ {
mark_adjust_nofold(line2 + 1, dest, -num_lines, 0L); mark_adjust(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
curbuf->b_op_start.lnum = dest - num_lines + 1; curbuf->b_op_start.lnum = dest - num_lines + 1;
curbuf->b_op_end.lnum = dest; curbuf->b_op_end.lnum = dest;
} }
else else
{ {
mark_adjust_nofold(dest + 1, line1 - 1, num_lines, 0L); mark_adjust(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
curbuf->b_op_start.lnum = dest + 1; curbuf->b_op_start.lnum = dest + 1;
curbuf->b_op_end.lnum = dest + num_lines; curbuf->b_op_end.lnum = dest + num_lines;
} }
curbuf->b_op_start.col = curbuf->b_op_end.col = 0; 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); -(last_line - dest - extra), 0L);
changed_lines(last_line - num_lines + 1, 0, last_line + 1, -extra);
/* /*
* Now we delete the original text -- webb * Now we delete the original text -- webb

2
src/version.c
View File

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