From 83d35e62f29aceebe3ccff961faef5a966aa8807 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 9 Jun 2019 16:00:52 +0200 Subject: move appended_lines_mark --- src/nvim/change.c | 18 +++++++----------- src/nvim/misc1.c | 13 ------------- 2 files changed, 7 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/nvim/change.c b/src/nvim/change.c index 4267429c25..b430f220d9 100644 --- a/src/nvim/change.c +++ b/src/nvim/change.c @@ -341,18 +341,14 @@ void appended_lines(linenr_T lnum, long count) /* * Like appended_lines(), but adjust marks first. */ - void -appended_lines_mark(linenr_T lnum, long count) +void appended_lines_mark(linenr_T lnum, long count) { - // Skip mark_adjust when adding a line after the last one, there can't - // be marks there. But it's still needed in diff mode. - if (lnum + count < curbuf->b_ml.ml_line_count -#ifdef FEAT_DIFF - || curwin->w_p_diff -#endif - ) - mark_adjust(lnum + 1, (linenr_T)MAXLNUM, count, 0L); - changed_lines(lnum + 1, 0, lnum + 1, count); + // Skip mark_adjust when adding a line after the last one, there can't + // be marks there. But it's still needed in diff mode. + if (lnum + count < curbuf->b_ml.ml_line_count || curwin->w_p_diff) { + mark_adjust(lnum + 1, (linenr_T)MAXLNUM, count, 0L, false); + } + changed_lines(lnum + 1, 0, lnum + 1, count, true); } /* diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c index f12fc574c7..9a4a01c0eb 100644 --- a/src/nvim/misc1.c +++ b/src/nvim/misc1.c @@ -1785,19 +1785,6 @@ int gchar_pos(pos_T *pos) return utf_ptr2char(ml_get_pos(pos)); } -/* - * Like appended_lines(), but adjust marks first. - */ -void appended_lines_mark(linenr_T lnum, long count) -{ - // Skip mark_adjust when adding a line after the last one, there can't - // be marks there. But it's still needed in diff mode. - if (lnum + count < curbuf->b_ml.ml_line_count || curwin->w_p_diff) { - mark_adjust(lnum + 1, (linenr_T)MAXLNUM, count, 0L, false); - } - changed_lines(lnum + 1, 0, lnum + 1, count, true); -} - /* * Deleted "count" lines at line "lnum" in the current buffer. * Must be called AFTER the change and after mark_adjust(). -- cgit