patch 7.4.2013

Problem:    Using "noinsert" in 'completeopt' breaks redo.
Solution:   Set compl_curr_match. (Shougo, closes #874)

diff --git a/src/edit.c b/src/edit.c
index 234e03dff9040abfe38bae747e8649a4cc015c6f..47c24f9d2f173ac77f6b072f8425e65c8deff846 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -4680,6 +4680,7 @@ ins_compl_insert(void)
                    EMPTY_IF_NULL(compl_shown_match->cp_text[CPT_INFO]));
     }
     set_vim_var_dict(VV_COMPLETED_ITEM, dict);
+    compl_curr_match = compl_shown_match;
 }
 
 /*

diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
index a5673c930f51ef42c71d55696f3d388d29014b64..cefaee26af46b2b4fb7fa7b1e9dc416a64c22be9 100644 (file)
--- a/src/testdir/test_popup.vim
+++ b/src/testdir/test_popup.vim
@@ -1,6 +1,5 @@
 " Test for completion menu
 
-inoremap <F5> <C-R>=ListMonths()<CR>
 let g:months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
 let g:setting = ''
 
@@ -13,23 +12,45 @@ func ListMonths()
 endfunc
 
 func! Test_popup_completion_insertmode()
-    new
-    call feedkeys("a\<f5>\<down>\<enter>\<esc>", 'tx')
-    call assert_equal('February', getline(1))
-    %d
-    let g:setting = 'noinsertmode'
-    call feedkeys("a\<f5>\<down>\<enter>\<esc>", 'tx')
-    call assert_equal('February', getline(1))
-    call assert_false(pumvisible())
-    %d
-    let g:setting = ''
-    call feedkeys("a\<f5>". repeat("\<c-n>",12)."\<enter>\<esc>", 'tx')
-    call assert_equal('', getline(1))
-    %d
-    call feedkeys("a\<f5>\<c-p>\<enter>\<esc>", 'tx')
-    call assert_equal('', getline(1))
-    %d
-    call feedkeys("a\<f5>\<c-p>\<c-p>\<enter>\<esc>", 'tx')
-    call assert_equal('December', getline(1))
-    bwipe!
+  new
+  inoremap <F5> <C-R>=ListMonths()<CR>
+
+  call feedkeys("a\<f5>\<down>\<enter>\<esc>", 'tx')
+  call assert_equal('February', getline(1))
+  %d
+  let g:setting = 'noinsertmode'
+  call feedkeys("a\<f5>\<down>\<enter>\<esc>", 'tx')
+  call assert_equal('February', getline(1))
+  call assert_false(pumvisible())
+  %d
+  let g:setting = ''
+  call feedkeys("a\<f5>". repeat("\<c-n>",12)."\<enter>\<esc>", 'tx')
+  call assert_equal('', getline(1))
+  %d
+  call feedkeys("a\<f5>\<c-p>\<enter>\<esc>", 'tx')
+  call assert_equal('', getline(1))
+  %d
+  call feedkeys("a\<f5>\<c-p>\<c-p>\<enter>\<esc>", 'tx')
+  call assert_equal('December', getline(1))
+
+  bwipe!
+  iunmap <F5>
+endfunc
+
+function! ComplTest() abort
+  call complete(1, ['source', 'soundfold'])
+  return ''
+endfunction
+
+func Test_noinsert_complete()
+  new
+  set completeopt+=noinsert
+  inoremap <F5>  <C-R>=ComplTest()<CR>
+  call feedkeys("i\<F5>soun\<CR>\<CR>\<ESC>.", 'tx')
+  call assert_equal('soundfold', getline(1))
+  call assert_equal('soundfold', getline(2))
+
+  bwipe!
+  set completeopt-=noinsert
+  iunmap <F5>
 endfunc

diff --git a/src/version.c b/src/version.c
index 39331b6c19bb7c74b18cf8e0a4f61965719b2002..f1da7b31f4dcd978f29708c8371be3313595cbaf 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2013,
 /**/
     2012,
 /**/