patch 8.0.0043

Problem:    When using Insert mode completion with 'completeopt' containing
            "noinsert" with CTRL-N the change is not saved for undo.  (Tommy
            Allen)
Solution:   Call stop_arrow() before inserting for any key.

diff --git a/src/edit.c b/src/edit.c
index 776a420f27d08e2d3a2e23e174e15d5db8b04062..3a0e18841cfa377fd49125704f1c52077192c172 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -4634,14 +4634,19 @@ ins_compl_get_exp(pos_T *ini)
     static void
 ins_compl_delete(void)
 {
-    int            i;
+    int            col;
 
     /*
      * In insert mode: Delete the typed part.
      * In replace mode: Put the old characters back, if any.
      */
-    i = compl_col + (compl_cont_status & CONT_ADDING ? compl_length : 0);
-    backspace_until_column(i);
+    col = compl_col + (compl_cont_status & CONT_ADDING ? compl_length : 0);
+    if ((int)curwin->w_cursor.col > col)
+    {
+       if (stop_arrow() == FAIL)
+           return;
+       backspace_until_column(col);
+    }
 
     /* TODO: is this sufficient for redrawing?  Redrawing everything causes
      * flicker, thus we can't do that. */
@@ -5059,8 +5064,11 @@ ins_complete(int c, int enable_pum)
     colnr_T    curs_col;           /* cursor column */
     int                n;
     int                save_w_wrow;
+    int                insert_match;
 
     compl_direction = ins_compl_key2dir(c);
+    insert_match = ins_compl_use_match(c);
+
     if (!compl_started)
     {
        /* First time we hit ^N or ^P (in a row, I mean) */
@@ -5486,6 +5494,8 @@ ins_complete(int c, int enable_pum)
        edit_submode_extra = NULL;
        out_flush();
     }
+    else if (insert_match && stop_arrow() == FAIL)
+       return FAIL;
 
     compl_shown_match = compl_curr_match;
     compl_shows_dir = compl_direction;
@@ -5494,8 +5504,7 @@ ins_complete(int c, int enable_pum)
      * Find next match (and following matches).
      */
     save_w_wrow = curwin->w_wrow;
-    n = ins_compl_next(TRUE, ins_compl_key2count(c),
-                                               ins_compl_use_match(c), FALSE);
+    n = ins_compl_next(TRUE, ins_compl_key2count(c), insert_match, FALSE);
 
     /* may undisplay the popup menu */
     ins_compl_upd_pum();

diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
index d037b7abd94a2b4060f4d9e17bc297b7225aedf2..cc93ff84fa60b7d6db963230a472c263151a9647 100644 (file)
--- a/src/testdir/test_popup.vim
+++ b/src/testdir/test_popup.vim
@@ -427,6 +427,11 @@ func Test_complete_no_undo()
   call feedkeys("u", 'xt')
   call assert_equal('bbb', getline(2))
 
+  call feedkeys("A\<Right>\<C-N>\<Esc>", 'xt')
+  call assert_equal('January', getline(2))
+  call feedkeys("u", 'xt')
+  call assert_equal('bbb', getline(2))
+
   iunmap <Right>
   set completeopt&
   q!

diff --git a/src/version.c b/src/version.c
index 3a2b1a5e048cb2a02a139aa80f2a190d97125800..e910845d1ccb4954f70599ee651f7c019959004a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    43,
 /**/
     42,
 /**/