From 2ba4238818ca5ea52334de3037ef3729584cebf5 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 16 Mar 2019 18:11:07 +0100 Subject: [PATCH] patch 8.1.1011: indent from autoindent not removed from blank line Problem: Indent from autoindent not removed from blank line. (Daniel Hahler) Solution: Do not reset did_ai when text follows. (closes #4119) --- src/misc1.c | 2 -- src/testdir/test_edit.vim | 13 ++++++++++++- src/version.c | 2 ++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/misc1.c b/src/misc1.c index 65d5e9ec5..5781aa5b3 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -1497,8 +1497,6 @@ open_line( ++less_cols_off; } } - if (*p_extra != NUL) - did_ai = FALSE; /* append some text, don't truncate now */ /* columns for marks adjusted for removed columns */ less_cols = (int)(p_extra - saved_line); diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim index 9a60d018e..b35497fc2 100644 --- a/src/testdir/test_edit.vim +++ b/src/testdir/test_edit.vim @@ -399,8 +399,19 @@ func Test_edit_13() call feedkeys("A {\more\}\", 'tnix') call assert_equal(["\tabc {", "\t\tmore", "\t}"], getline(1, '$')) set smartindent& autoindent& - bw! + bwipe! endif + + " Test autoindent removing indent of blank line. + new + call setline(1, ' foo bar baz') + set autoindent + exe "normal 0eea\\\" + call assert_equal(" foo bar", getline(1)) + call assert_equal("", getline(2)) + call assert_equal(" baz", getline(3)) + set autoindent& + bwipe! endfunc func Test_edit_CR() diff --git a/src/version.c b/src/version.c index dc2d73d44..35b40ca3b 100644 --- a/src/version.c +++ b/src/version.c @@ -779,6 +779,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1011, /**/ 1010, /**/ -- 2.50.1