IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.1896 (#5258)

Browse Source 
Problem:    Invoking mark_adjust() when adding a new line below the last line
            is pointless.
Solution:   Skip calling mark_adjust() when appending below the last line.

82faa259cc
This commit is contained in:
Jurica Bradarić 2016-08-29 20:35:48 +02:00 committed by Justin M. Keyes
parent 10a54ad12e
commit 7fd771619f
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/nvim/misc1.c
View File

@ -742,10 +742,14 @@ open_line (
if (ml_append(curwin->w_cursor.lnum, p_extra, (colnr_T)0, FALSE) if (ml_append(curwin->w_cursor.lnum, p_extra, (colnr_T)0, FALSE)
== FAIL) == FAIL)
goto theend; goto theend;
/* Postpone calling changed_lines(), because it would mess up folding // Postpone calling changed_lines(), because it would mess up folding
* with markers. */ // with markers.
mark_adjust(curwin->w_cursor.lnum + 1, (linenr_T)MAXLNUM, 1L, 0L); // Skip mark_adjust when adding a line after the last one, there can't
did_append = TRUE; // be marks there.
if (curwin->w_cursor.lnum + 1 < curbuf->b_ml.ml_line_count) {
mark_adjust(curwin->w_cursor.lnum + 1, (linenr_T)MAXLNUM, 1L, 0L);
}
did_append = true;
} else { } else {
/* /*
* In VREPLACE mode we are starting to replace the next line. * In VREPLACE mode we are starting to replace the next line.
@ -1871,7 +1875,11 @@ void appended_lines(linenr_T lnum, long count)
*/ */
void appended_lines_mark(linenr_T lnum, long count) void appended_lines_mark(linenr_T lnum, long count)
{ {
mark_adjust(lnum + 1, (linenr_T)MAXLNUM, count, 0L); // Skip mark_adjust when adding a line after the last one, there can't
// be marks there.
if (lnum + count < curbuf->b_ml.ml_line_count) {
mark_adjust(lnum + 1, (linenr_T)MAXLNUM, count, 0L);
}
changed_lines(lnum + 1, 0, lnum + 1, count); changed_lines(lnum + 1, 0, lnum + 1, count);
} }

9
src/nvim/ops.c
View File

@ -3110,8 +3110,13 @@ error:
if (dir == FORWARD) if (dir == FORWARD)
curbuf->b_op_start.lnum++; curbuf->b_op_start.lnum++;
} }
mark_adjust(curbuf->b_op_start.lnum + (y_type == kMTCharWise), // Skip mark_adjust when adding lines after the last one, there
(linenr_T)MAXLNUM, nr_lines, 0L); // can't be marks there.
if (curbuf->b_op_start.lnum + (y_type == kMTCharWise) - 1 + nr_lines
< curbuf->b_ml.ml_line_count) {
mark_adjust(curbuf->b_op_start.lnum + (y_type == kMTCharWise),
(linenr_T)MAXLNUM, nr_lines, 0L);
}
// note changed text for displaying and folding // note changed text for displaying and folding
if (y_type == kMTCharWise) { if (y_type == kMTCharWise) {

2
src/nvim/version.c
View File

@ -380,7 +380,7 @@ static int included_patches[] = {
// 1899 NA // 1899 NA
1898, 1898,
// 1897, // 1897,
// 1896, 1896,
// 1895, // 1895,
// 1894 NA // 1894 NA
// 1893, // 1893,