Skip to content

Commit abb4d5f

Browse files
committed
patch 8.0.0449: part of fold patch accidentally included
Problem: Part of fold patch accidentally included. Solution: Revert that part of the patch.
1 parent b5aedf3 commit abb4d5f

File tree

2 files changed

+8
-23
lines changed

2 files changed

+8
-23
lines changed

src/ex_cmds.c

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -851,41 +851,24 @@ do_move(linenr_T line1, linenr_T line2, linenr_T dest)
851851
* their final destination at the new text position -- webb
852852
*/
853853
last_line = curbuf->b_ml.ml_line_count;
854-
mark_adjust_nofold(line1, line2, last_line - line2, 0L);
854+
mark_adjust(line1, line2, last_line - line2, 0L);
855+
changed_lines(last_line - num_lines + 1, 0, last_line + 1, num_lines);
855856
if (dest >= line2)
856857
{
857-
mark_adjust_nofold(line2 + 1, dest, -num_lines, 0L);
858-
#ifdef FEAT_FOLDING
859-
win_T *win;
860-
tabpage_T *tp;
861-
862-
FOR_ALL_TAB_WINDOWS(tp, win) {
863-
if (win->w_buffer == curbuf)
864-
foldSwapRange(&win->w_folds, line1, line2, dest + 1,
865-
dest + num_lines);
866-
}
867-
#endif
858+
mark_adjust(line2 + 1, dest, -num_lines, 0L);
868859
curbuf->b_op_start.lnum = dest - num_lines + 1;
869860
curbuf->b_op_end.lnum = dest;
870861
}
871862
else
872863
{
873-
mark_adjust_nofold(dest + 1, line1 - 1, num_lines, 0L);
874-
#ifdef FEAT_FOLDING
875-
win_T *win;
876-
tabpage_T *tp;
877-
878-
FOR_ALL_TAB_WINDOWS(tp, win) {
879-
if (win->w_buffer == curbuf)
880-
foldSwapRange(&win->w_folds, dest + 1, line1 - 1, line1, line2);
881-
}
882-
#endif
864+
mark_adjust(dest + 1, line1 - 1, num_lines, 0L);
883865
curbuf->b_op_start.lnum = dest + 1;
884866
curbuf->b_op_end.lnum = dest + num_lines;
885867
}
886868
curbuf->b_op_start.col = curbuf->b_op_end.col = 0;
887-
mark_adjust_nofold(last_line - num_lines + 1, last_line,
869+
mark_adjust(last_line - num_lines + 1, last_line,
888870
-(last_line - dest - extra), 0L);
871+
changed_lines(last_line - num_lines + 1, 0, last_line + 1, -extra);
889872

890873
/*
891874
* Now we delete the original text -- webb

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static char *(features[]) =
764764

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
449,
767769
/**/
768770
448,
769771
/**/

0 commit comments

Comments
 (0)