Mercurial > vim
changeset 26813:efa773bec478 v8.2.3935
patch 8.2.3935: CTRL-U in Insert mode does not fix the indent
Commit: https://github.com/vim/vim/commit/5d20fbf2e79b96a39abbdadc486b656cdcc67ed6
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Dec 29 16:05:31 2021 +0000
patch 8.2.3935: CTRL-U in Insert mode does not fix the indent
Problem: CTRL-U in Insert mode does not fix the indent.
Solution: Fix the indent when 'cindent' is set.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Wed, 29 Dec 2021 17:15:02 +0100 |
parents | 4545b6dd8210 |
children | 523455824b29 |
files | src/edit.c src/testdir/test_textformat.vim src/version.c |
diffstat | 3 files changed, 33 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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