diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-10-16 15:35:47 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-10-16 15:35:47 +0200 |
| commit | 869e35270ecffd9024958880cb03f6f0bb01ea93 (patch) | |
| tree | da022669c9ecf5145ffce0963fa53984fda22c17 | |
| parent | 8507747600bddfd6a68aed057840856bf5548e61 (diff) | |
patch 8.0.0041v8.0.0041
Problem: When using Insert mode completion but not actually inserting
anything an undo item is still created. (Tommy Allen)
Solution: Do not call stop_arrow() when not inserting anything.
| -rw-r--r-- | src/edit.c | 6 | ||||
| -rw-r--r-- | src/testdir/test_popup.vim | 28 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 31 insertions, 5 deletions
diff --git a/src/edit.c b/src/edit.c index d763b53183..53b43c485a 100644 --- a/src/edit.c +++ b/src/edit.c @@ -2799,9 +2799,6 @@ set_completion(colnr_T startcol, list_T *list) ins_compl_prep(' '); ins_compl_clear(); - if (stop_arrow() == FAIL) - return; - compl_direction = FORWARD; if (startcol > curwin->w_cursor.col) startcol = curwin->w_cursor.col; @@ -3876,7 +3873,8 @@ ins_compl_prep(int c) /* put the cursor on the last char, for 'tw' formatting */ if (prev_col > 0) dec_cursor(); - if (stop_arrow() == OK) + /* only format when something was inserted */ + if (!arrow_used && !ins_need_undo) insertchar(NUL, 0, -1); if (prev_col > 0 && ml_get_curline()[curwin->w_cursor.col] != NUL) diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim index 7cb0e10aa1..38459b323e 100644 --- a/src/testdir/test_popup.vim +++ b/src/testdir/test_popup.vim @@ -378,7 +378,7 @@ func DummyCompleteFour(findstart, base) endif endfunc -:"Test that 'completefunc' works when it's OK. +" Test that 'completefunc' works when it's OK. func Test_omnifunc_with_check() new setlocal omnifunc=DummyCompleteFour @@ -400,4 +400,30 @@ func Test_omnifunc_with_check() q! endfunc +function UndoComplete() + call complete(1, ['January', 'February', 'March', + \ 'April', 'May', 'June', 'July', 'August', 'September', + \ 'October', 'November', 'December']) + return '' +endfunc + +" Test that no undo item is created when no completion is inserted +func Test_complete_no_undo() + set completeopt=menu,preview,noinsert,noselect + inoremap <Right> <C-R>=UndoComplete()<CR> + new + call feedkeys("ixxx\<CR>\<CR>yyy\<Esc>k", 'xt') + call feedkeys("iaaa\<Esc>0", 'xt') + call assert_equal('aaa', getline(2)) + call feedkeys("i\<Right>\<Esc>", 'xt') + call assert_equal('aaa', getline(2)) + call feedkeys("u", 'xt') + call assert_equal('', getline(2)) + + iunmap <Right> + set completeopt& + q! +endfunc + + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index e6f8f47821..4902d69f09 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 41, +/**/ 40, /**/ 39, |