diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-12-29 16:05:31 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-12-29 16:05:31 +0000 |
| commit | 5d20fbf2e79b96a39abbdadc486b656cdcc67ed6 (patch) | |
| tree | 2601a6a32e62402ba28471be2175d67f8e2e339d /src | |
| parent | 5ea5f373729589acb38ce3f3ca338e8a6d398bdc (diff) | |
patch 8.2.3935: CTRL-U in Insert mode does not fix the indentv8.2.3935
Problem: CTRL-U in Insert mode does not fix the indent.
Solution: Fix the indent when 'cindent' is set.
Diffstat (limited to 'src')
| -rw-r--r-- | src/edit.c | 15 | ||||
| -rw-r--r-- | src/testdir/test_textformat.vim | 17 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 33 insertions, 1 deletions
diff --git a/src/edit.c b/src/edit.c index f4e9327b6d..bccf3194db 100644 --- a/src/edit.c +++ b/src/edit.c @@ -3980,6 +3980,9 @@ ins_bs( int in_indent; int oldState; int cpc[MAX_MCO]; // composing characters +#if defined(FEAT_LISP) || defined(FEAT_CINDENT) + int call_fix_indent = FALSE; +#endif /* * can't delete anything in an empty file @@ -4161,7 +4164,13 @@ ins_bs( save_col = curwin->w_cursor.col; beginline(BL_WHITE); if (curwin->w_cursor.col < save_col) + { mincol = curwin->w_cursor.col; +#if defined(FEAT_LISP) || defined(FEAT_CINDENT) + // should now fix the indent to match with the previous line + call_fix_indent = TRUE; +#endif + } curwin->w_cursor.col = save_col; } @@ -4333,6 +4342,12 @@ ins_bs( #endif if (curwin->w_cursor.col <= 1) did_ai = FALSE; + +#if defined(FEAT_LISP) || defined(FEAT_CINDENT) + if (call_fix_indent) + fix_indent(); +#endif + /* * It's a little strange to put backspaces into the redo * buffer, but it makes auto-indent a lot easier to deal diff --git a/src/testdir/test_textformat.vim b/src/testdir/test_textformat.vim index 1a7bb68728..ccfd36f753 100644 --- a/src/testdir/test_textformat.vim +++ b/src/testdir/test_textformat.vim @@ -238,7 +238,7 @@ func Test_format_c_comment() END call assert_equal(expected, getline(1, '$')) - " Using "o" repeates the line comment, "O" does not. + " Using "o" repeats the line comment, "O" does not. %del let text =<< trim END nop; @@ -261,6 +261,21 @@ func Test_format_c_comment() END call assert_equal(expected, getline(1, '$')) + " Using CTRL-U after "o" fixes the indent + %del + let text =<< trim END + { + val = val; // This is a comment + END + call setline(1, text) + exe "normal! 2Go\<C-U>x\<Esc>" + let expected =<< trim END + { + val = val; // This is a comment + x + END + call assert_equal(expected, getline(1, '$')) + bwipe! endfunc diff --git a/src/version.c b/src/version.c index e4b481bf27..6849bd998b 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3935, +/**/ 3934, /**/ 3933, |