From 1b38344e00af65df12946fffda7f3201621c35ef Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 26 Sep 2017 20:04:54 +0200 Subject: [PATCH] patch 8.0.1154: 'indentkeys' does not work properly Problem: 'indentkeys' does not work properly. (Gary Johnson) Solution: Get the cursor line again. (Christian Brabandt, closes #2151) --- src/edit.c | 2 +- src/testdir/test_edit.vim | 27 +++++++++++++++++++++++++++ src/version.c | 2 ++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/src/edit.c b/src/edit.c index 14201a2ec..5f513068a 100644 --- a/src/edit.c +++ b/src/edit.c @@ -8202,7 +8202,7 @@ in_cinkeys( { /* "0=word": Check if there are only blanks before the * word. */ - if (getwhitecols(line) != + if (getwhitecols_curline() != (int)(curwin->w_cursor.col - (p - look))) match = FALSE; } diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim index 0986bf9b1..cc9540c77 100644 --- a/src/testdir/test_edit.vim +++ b/src/testdir/test_edit.vim @@ -314,6 +314,33 @@ func! Test_edit_11() bw! endfunc +func! Test_edit_11_indentexpr() + " Test that indenting kicks in + new + " Use indentexpr instead of cindenting + func! Do_Indent() + let pline=prevnonblank(v:lnum) + if empty(getline(v:lnum)) + if getline(pline) =~ 'if\|then' + return shiftwidth() + else + return 0 + endif + else + return 0 + endif + endfunc + setl indentexpr=Do_Indent() indentkeys+=0=then,0=fi + call setline(1, ['if [ $this ]']) + call cursor(1, 1) + call feedkeys("othen\that\fi", 'tnix') + call assert_equal(['if [ $this ]', "then", "\that", "fi"], getline(1, '$')) + set cinkeys&vim indentkeys&vim + set nocindent indentexpr= + delfu Do_Indent + bw! +endfunc + func! Test_edit_12() " Test changing indent in replace mode new diff --git a/src/version.c b/src/version.c index b63246e74..d38664cd9 100644 --- a/src/version.c +++ b/src/version.c @@ -761,6 +761,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1154, /**/ 1153, /**/ -- 2.50.1