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)
diff --git a/src/misc1.c b/src/misc1.c
index 65d5e9e..5781aa5 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -1497,8 +1497,6 @@
++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 9a60d01..b35497f 100644
--- a/src/testdir/test_edit.vim
+++ b/src/testdir/test_edit.vim
@@ -399,8 +399,19 @@
call feedkeys("A {\<cr>more\<cr>}\<esc>", '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\<CR>\<CR>\<Esc>"
+ 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 dc2d73d..35b40ca 100644
--- a/src/version.c
+++ b/src/version.c
@@ -780,6 +780,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1011,
+/**/
1010,
/**/
1009,