Merge #10323 from janlazo/vim-8.1.1055

vim-patch:8.0.{1479,1480,1482},8.1.1055

9 files changed, 151 insertions, 69 deletions

diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 8040109685..57c4a5395c 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -64,6 +64,7 @@
 
 #define CTRL_X_WANT_IDENT       0x100
 
+#define CTRL_X_NORMAL           0  ///< CTRL-N CTRL-P completion, default
 #define CTRL_X_NOT_DEFINED_YET  1
 #define CTRL_X_SCROLL           2
 #define CTRL_X_WHOLE_LINE       3
@@ -78,11 +79,12 @@
 #define CTRL_X_FUNCTION         12
 #define CTRL_X_OMNI             13
 #define CTRL_X_SPELL            14
-#define CTRL_X_LOCAL_MSG        15      /* only used in "ctrl_x_msgs" */
+#define CTRL_X_LOCAL_MSG        15  ///< only used in "ctrl_x_msgs"
 #define CTRL_X_EVAL             16  ///< for builtin function complete()
 
 #define CTRL_X_MSG(i) ctrl_x_msgs[(i) & ~CTRL_X_WANT_IDENT]
-#define CTRL_X_MODE_LINE_OR_EVAL(m) (m == CTRL_X_WHOLE_LINE || m == CTRL_X_EVAL)
+#define CTRL_X_MODE_LINE_OR_EVAL(m) \
+  ((m) == CTRL_X_WHOLE_LINE || (m) == CTRL_X_EVAL)
 
 // Message for CTRL-X mode, index is ctrl_x_mode.
 static char *ctrl_x_msgs[] =
@@ -192,6 +194,9 @@ static int compl_restarting = FALSE;            /* don't insert match */
  * FALSE the word to be completed must be located. */
 static int compl_started = FALSE;
 
+// Which Ctrl-X mode are we in?
+static int ctrl_x_mode = CTRL_X_NORMAL;
+
 static int compl_matches = 0;
 static char_u     *compl_pattern = NULL;
 static int compl_direction = FORWARD;
@@ -276,7 +281,7 @@ static int ins_need_undo;               /* call u_save() before inserting a
 static bool did_add_space = false;      // auto_format() added an extra space
                                         // under the cursor
 static TriState dont_sync_undo = kFalse;  // CTRL-G U prevents syncing undo
-                                          // for the next left/right cursor
+                                          // for the next left/right cursor key
 
 static linenr_T o_lnum = 0;
 
@@ -509,7 +514,7 @@ static int insert_check(VimState *state)
   // If typed something may trigger CursorHoldI again.
   if (s->c != K_EVENT
       // but not in CTRL-X mode, a script can't restore the state
-      && ctrl_x_mode == 0) {
+      && ctrl_x_mode == CTRL_X_NORMAL) {
     did_cursorhold = false;
   }
 
@@ -518,7 +523,10 @@ static int insert_check(VimState *state)
     s->inserted_space = false;
   }
 
-  if (can_cindent && cindent_on() && ctrl_x_mode == 0 && !compl_started) {
+  if (can_cindent
+      && cindent_on()
+      && ctrl_x_mode == CTRL_X_NORMAL
+      && !compl_started) {
     insert_do_cindent(s);
   }
 
@@ -1037,7 +1045,7 @@ check_pum:
     if (mod_mask & (MOD_MASK_SHIFT|MOD_MASK_CTRL)) {
       ins_s_left();
     } else {
-      ins_left(dont_sync_undo == kFalse);
+      ins_left();
     }
     break;
 
@@ -1050,7 +1058,7 @@ check_pum:
     if (mod_mask & (MOD_MASK_SHIFT|MOD_MASK_CTRL)) {
       ins_s_right();
     } else {
-      ins_right(dont_sync_undo == kFalse);
+      ins_right();
     }
     break;
 
@@ -1204,7 +1212,8 @@ check_pum:
     // if 'complete' is empty then plain ^P is no longer special,
     // but it is under other ^X modes
     if (*curbuf->b_p_cpt == NUL
-        && ctrl_x_mode != 0
+        && (ctrl_x_mode == CTRL_X_NORMAL
+            || ctrl_x_mode == CTRL_X_WHOLE_LINE)
         && !(compl_cont_status & CONT_LOCAL)) {
       goto normalchar;
     }
@@ -1921,6 +1930,19 @@ static void ins_ctrl_x(void)
   }
 }
 
+// Whether other than default completion has been selected.
+bool ctrl_x_mode_not_default(void)
+{
+  return ctrl_x_mode != CTRL_X_NORMAL;
+}
+
+// Whether CTRL-X was typed without a following character.
+bool ctrl_x_mode_not_defined_yet(void)
+{
+  return ctrl_x_mode == CTRL_X_NOT_DEFINED_YET;
+}
+
+
 /// Check that the "dict" or "tsr" option can be used.
 ///
 /// @param  dict_opt  check "dict" when true, "tsr" when false.
@@ -1929,7 +1951,7 @@ static bool check_compl_option(bool dict_opt)
   if (dict_opt
       ? (*curbuf->b_p_dict == NUL && *p_dict == NUL && !curwin->w_p_spell)
       : (*curbuf->b_p_tsr == NUL && *p_tsr == NUL)) {
-    ctrl_x_mode = 0;
+    ctrl_x_mode = CTRL_X_NORMAL;
     edit_submode = NULL;
     msg_attr((dict_opt
               ? _("'dictionary' option is empty")
@@ -2460,7 +2482,7 @@ void completeopt_was_set(void)
 void set_completion(colnr_T startcol, list_T *list)
 {
   // If already doing completions stop it.
-  if (ctrl_x_mode != 0) {
+  if (ctrl_x_mode != CTRL_X_NORMAL) {
     ins_compl_prep(' ');
   }
   ins_compl_clear();
@@ -3331,7 +3353,7 @@ static bool ins_compl_prep(int c)
 
   /* Set "compl_get_longest" when finding the first matches. */
   if (ctrl_x_mode == CTRL_X_NOT_DEFINED_YET
-      || (ctrl_x_mode == 0 && !compl_started)) {
+      || (ctrl_x_mode == CTRL_X_NORMAL && !compl_started)) {
     compl_get_longest = (strstr((char *)p_cot, "longest") != NULL);
     compl_used_match = TRUE;
 
@@ -3426,18 +3448,19 @@ static bool ins_compl_prep(int c)
         else
           compl_cont_mode = CTRL_X_NOT_DEFINED_YET;
       }
-      ctrl_x_mode = 0;
+      ctrl_x_mode = CTRL_X_NORMAL;
       edit_submode = NULL;
       showmode();
       break;
     }
-  } else if (ctrl_x_mode != 0) {
-    /* We're already in CTRL-X mode, do we stay in it? */
+  } else if (ctrl_x_mode != CTRL_X_NORMAL) {
+    // We're already in CTRL-X mode, do we stay in it?
     if (!vim_is_ctrl_x_key(c)) {
-      if (ctrl_x_mode == CTRL_X_SCROLL)
-        ctrl_x_mode = 0;
-      else
+      if (ctrl_x_mode == CTRL_X_SCROLL) {
+        ctrl_x_mode = CTRL_X_NORMAL;
+      } else {
         ctrl_x_mode = CTRL_X_FINISHED;
+      }
       edit_submode = NULL;
     }
     showmode();
@@ -3448,7 +3471,10 @@ static bool ins_compl_prep(int c)
      * 'Pattern not found') until another key is hit, then go back to
      * showing what mode we are in. */
     showmode();
-    if ((ctrl_x_mode == 0 && c != Ctrl_N && c != Ctrl_P && c != Ctrl_R
+    if ((ctrl_x_mode == CTRL_X_NORMAL
+         && c != Ctrl_N
+         && c != Ctrl_P
+         && c != Ctrl_R
          && !ins_compl_pum_key(c))
         || ctrl_x_mode == CTRL_X_FINISHED) {
       /* Get here when we have finished typing a sequence of ^N and
@@ -3526,8 +3552,8 @@ static bool ins_compl_prep(int c)
       if (!shortmess(SHM_COMPLETIONMENU)) {
         msg_clr_cmdline();                // necessary for "noshowmode"
       }
-      ctrl_x_mode = 0;
-      compl_enter_selects = FALSE;
+      ctrl_x_mode = CTRL_X_NORMAL;
+      compl_enter_selects = false;
       if (edit_submode != NULL) {
         edit_submode = NULL;
         showmode();
@@ -3855,7 +3881,8 @@ static int ins_compl_get_exp(pos_T *ini)
     /* For ^N/^P pick a new entry from e_cpt if compl_started is off,
      * or if found_all says this entry is done.  For ^X^L only use the
      * entries from 'complete' that look in loaded buffers. */
-    if ((l_ctrl_x_mode == 0 || CTRL_X_MODE_LINE_OR_EVAL(l_ctrl_x_mode))
+    if ((l_ctrl_x_mode == CTRL_X_NORMAL
+         || CTRL_X_MODE_LINE_OR_EVAL(l_ctrl_x_mode))
         && (!compl_started || found_all)) {
       found_all = FALSE;
       while (*e_cpt == ',' || *e_cpt == ' ')
@@ -3865,7 +3892,7 @@ static int ins_compl_get_exp(pos_T *ini)
         first_match_pos = *ini;
         // Move the cursor back one character so that ^N can match the
         // word immediately after the cursor.
-        if (ctrl_x_mode == 0 && dec(&first_match_pos) < 0) {
+        if (ctrl_x_mode == CTRL_X_NORMAL && dec(&first_match_pos) < 0) {
           // Move the cursor to after the last character in the
           // buffer, so that word at start of buffer is found
           // correctly.
@@ -3983,9 +4010,9 @@ static int ins_compl_get_exp(pos_T *ini)
       /* Find up to TAG_MANY matches.  Avoids that an enormous number
        * of matches is found when compl_pattern is empty */
       if (find_tags(compl_pattern, &num_matches, &matches,
-              TAG_REGEXP | TAG_NAMES | TAG_NOIC |
-              TAG_INS_COMP | (l_ctrl_x_mode ? TAG_VERBOSE : 0),
-              TAG_MANY, curbuf->b_ffname) == OK && num_matches > 0) {
+                    TAG_REGEXP | TAG_NAMES | TAG_NOIC | TAG_INS_COMP
+                    | (l_ctrl_x_mode != CTRL_X_NORMAL ? TAG_VERBOSE : 0),
+                    TAG_MANY, curbuf->b_ffname) == OK && num_matches > 0) {
         ins_compl_add_matches(num_matches, matches, p_ic);
       }
       p_ic = save_p_ic;
@@ -4159,9 +4186,10 @@ static int ins_compl_get_exp(pos_T *ini)
       found_new_match = OK;
     }
 
-    /* break the loop for specialized modes (use 'complete' just for the
-     * generic l_ctrl_x_mode == 0) or when we've found a new match */
-    if ((l_ctrl_x_mode != 0 && !CTRL_X_MODE_LINE_OR_EVAL(l_ctrl_x_mode))
+    // break the loop for specialized modes (use 'complete' just for the
+    // generic l_ctrl_x_mode == CTRL_X_NORMAL) or when we've found a new match
+    if ((l_ctrl_x_mode != CTRL_X_NORMAL
+         && !CTRL_X_MODE_LINE_OR_EVAL(l_ctrl_x_mode))
         || found_new_match != FAIL) {
       if (got_int)
         break;
@@ -4169,7 +4197,8 @@ static int ins_compl_get_exp(pos_T *ini)
       if (type != -1)
         ins_compl_check_keys(0, false);
 
-      if ((l_ctrl_x_mode != 0 && !CTRL_X_MODE_LINE_OR_EVAL(l_ctrl_x_mode))
+      if ((l_ctrl_x_mode != CTRL_X_NORMAL
+           && !CTRL_X_MODE_LINE_OR_EVAL(l_ctrl_x_mode))
           || compl_interrupted) {
         break;
       }
@@ -4186,14 +4215,16 @@ static int ins_compl_get_exp(pos_T *ini)
   }
   compl_started = TRUE;
 
-  if ((l_ctrl_x_mode == 0 || CTRL_X_MODE_LINE_OR_EVAL(l_ctrl_x_mode))
+  if ((l_ctrl_x_mode == CTRL_X_NORMAL
+       || CTRL_X_MODE_LINE_OR_EVAL(l_ctrl_x_mode))
       && *e_cpt == NUL) {  // Got to end of 'complete'
     found_new_match = FAIL;
   }
 
   i = -1;               /* total of matches, unknown */
   if (found_new_match == FAIL
-      || (l_ctrl_x_mode != 0 && !CTRL_X_MODE_LINE_OR_EVAL(l_ctrl_x_mode))) {
+      || (l_ctrl_x_mode != CTRL_X_NORMAL
+          && !CTRL_X_MODE_LINE_OR_EVAL(l_ctrl_x_mode))) {
     i = ins_compl_make_cyclic();
   }
 
@@ -4508,12 +4539,12 @@ void ins_compl_check_keys(int frequency, int in_compl_func)
 {
   static int count = 0;
 
-  int c;
-
-  /* Don't check when reading keys from a script.  That would break the test
-   * scripts */
-  if (using_script())
+  // Don't check when reading keys from a script, :normal or feedkeys().
+  // That would break the test scripts.  But do check for keys when called
+  // from complete_check().
+  if (!in_compl_func && (using_script() || ex_normal_busy)) {
     return;
+  }
 
   /* Only do this at regular intervals */
   if (++count < frequency)
@@ -4522,7 +4553,7 @@ void ins_compl_check_keys(int frequency, int in_compl_func)
 
   /* Check for a typed key.  Do use mappings, otherwise vim_is_ctrl_x_key()
    * can't do its work correctly. */
-  c = vpeekc_any();
+  int c = vpeekc_any();
   if (c != NUL) {
     if (vim_is_ctrl_x_key(c) && c != Ctrl_X && c != Ctrl_R) {
       c = safe_vgetc();         /* Eat the character */
@@ -4671,8 +4702,9 @@ static int ins_complete(int c, bool enable_pum)
       /*
        * it is a continued search
        */
-      compl_cont_status &= ~CONT_INTRPT;        /* remove INTRPT */
-      if (ctrl_x_mode == 0 || ctrl_x_mode == CTRL_X_PATH_PATTERNS
+      compl_cont_status &= ~CONT_INTRPT;        // remove INTRPT
+      if (ctrl_x_mode == CTRL_X_NORMAL
+          || ctrl_x_mode == CTRL_X_PATH_PATTERNS
           || ctrl_x_mode == CTRL_X_PATH_DEFINES) {
         if (compl_startpos.lnum != curwin->w_cursor.lnum) {
           /* line (probably) wrapped, set compl_startpos to the
@@ -4716,16 +4748,18 @@ static int ins_complete(int c, bool enable_pum)
 
     if (!(compl_cont_status & CONT_ADDING)) {   /* normal expansion */
       compl_cont_mode = ctrl_x_mode;
-      if (ctrl_x_mode != 0)             /* Remove LOCAL if ctrl_x_mode != 0 */
+      if (ctrl_x_mode != CTRL_X_NORMAL) {
+        // Remove LOCAL if ctrl_x_mode != CTRL_X_NORMAL
         compl_cont_status = 0;
+      }
       compl_cont_status |= CONT_N_ADDS;
       compl_startpos = curwin->w_cursor;
       startcol = (int)curs_col;
       compl_col = 0;
     }
 
-    /* Work out completion pattern and original text -- webb */
-    if (ctrl_x_mode == 0 || (ctrl_x_mode & CTRL_X_WANT_IDENT)) {
+    // Work out completion pattern and original text -- webb
+    if (ctrl_x_mode == CTRL_X_NORMAL || (ctrl_x_mode & CTRL_X_WANT_IDENT)) {
       if ((compl_cont_status & CONT_SOL)
           || ctrl_x_mode == CTRL_X_PATH_DEFINES) {
         if (!(compl_cont_status & CONT_ADDING)) {
@@ -4880,7 +4914,7 @@ static int ins_complete(int c, bool enable_pum)
       if (col == -2)
         return FAIL;
       if (col == -3) {
-        ctrl_x_mode = 0;
+        ctrl_x_mode = CTRL_X_NORMAL;
         edit_submode = NULL;
         if (!shortmess(SHM_COMPLETIONMENU)) {
           msg_clr_cmdline();
@@ -5011,12 +5045,13 @@ static int ins_complete(int c, bool enable_pum)
      * because we couldn't expand anything at first place, but if we used
      * ^P, ^N, ^X^I or ^X^D we might want to add-expand a single-char-word
      * (such as M in M'exico) if not tried already.  -- Acevedo */
-    if (       compl_length > 1
-               || (compl_cont_status & CONT_ADDING)
-               || (ctrl_x_mode != 0
-                   && ctrl_x_mode != CTRL_X_PATH_PATTERNS
-                   && ctrl_x_mode != CTRL_X_PATH_DEFINES))
+    if (compl_length > 1
+        || (compl_cont_status & CONT_ADDING)
+        || (ctrl_x_mode != CTRL_X_NORMAL
+            && ctrl_x_mode != CTRL_X_PATH_PATTERNS
+            && ctrl_x_mode != CTRL_X_PATH_DEFINES)) {
       compl_cont_status &= ~CONT_N_ADDS;
+    }
   }
 
   if (compl_curr_match->cp_flags & CONT_S_IPOS)
@@ -8103,9 +8138,10 @@ static void ins_mousescroll(int dir)
 
 
 
-static void ins_left(bool end_change)
+static void ins_left(void)
 {
   pos_T tpos;
+  const bool end_change = dont_sync_undo == kFalse;  // end undoable change
 
   if ((fdo_flags & FDO_HOR) && KeyTyped)
     foldOpenCursor();
@@ -8167,23 +8203,31 @@ static void ins_end(int c)
 
 static void ins_s_left(void)
 {
-  if ((fdo_flags & FDO_HOR) && KeyTyped)
+  const bool end_change = dont_sync_undo == kFalse;  // end undoable change
+  if ((fdo_flags & FDO_HOR) && KeyTyped) {
     foldOpenCursor();
+  }
   undisplay_dollar();
   if (curwin->w_cursor.lnum > 1 || curwin->w_cursor.col > 0) {
-    start_arrow(&curwin->w_cursor);
+    start_arrow_with_change(&curwin->w_cursor, end_change);
+    if (!end_change) {
+      AppendCharToRedobuff(K_S_LEFT);
+    }
     (void)bck_word(1L, false, false);
     curwin->w_set_curswant = true;
   } else {
     vim_beep(BO_CRSR);
   }
+  dont_sync_undo = kFalse;
 }
 
 /// @param end_change      end undoable change
-static void ins_right(bool end_change)
+static void ins_right(void)
 {
-  if ((fdo_flags & FDO_HOR) && KeyTyped)
+  const bool end_change = dont_sync_undo == kFalse;  // end undoable change
+  if ((fdo_flags & FDO_HOR) && KeyTyped) {
     foldOpenCursor();
+  }
   undisplay_dollar();
   if (gchar_cursor() != NUL || virtual_active()) {
     start_arrow_with_change(&curwin->w_cursor, end_change);
@@ -8220,17 +8264,23 @@ static void ins_right(bool end_change)
 
 static void ins_s_right(void)
 {
-  if ((fdo_flags & FDO_HOR) && KeyTyped)
+  const bool end_change = dont_sync_undo == kFalse;  // end undoable change
+  if ((fdo_flags & FDO_HOR) && KeyTyped) {
     foldOpenCursor();
+  }
   undisplay_dollar();
   if (curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count
       || gchar_cursor() != NUL) {
-    start_arrow(&curwin->w_cursor);
+    start_arrow_with_change(&curwin->w_cursor, end_change);
+    if (!end_change) {
+      AppendCharToRedobuff(K_S_RIGHT);
+    }
     (void)fwd_word(1L, false, 0);
     curwin->w_set_curswant = true;
   } else {
     vim_beep(BO_CRSR);
   }
+  dont_sync_undo = kFalse;
 }
 
 static void
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index 10937879a1..7efae1e637 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -1778,7 +1778,7 @@ static int vgetorpeek(int advance)
               && !(State == HITRETURN && (c1 == CAR || c1 == ' '))
               && State != ASKMORE
               && State != CONFIRM
-              && !((ctrl_x_mode != 0 && vim_is_ctrl_x_key(c1))
+              && !((ctrl_x_mode_not_default() && vim_is_ctrl_x_key(c1))
                    || ((compl_cont_status & CONT_LOCAL)
                        && (c1 == Ctrl_N || c1 == Ctrl_P)))
               ) {
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index dbbc7cdafd..68b2640aa5 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -700,11 +700,10 @@ EXTERN int arrow_used;                  /* Normally FALSE, set to TRUE after
                                          * to call u_sync() */
 EXTERN int ins_at_eol INIT(= FALSE);      /* put cursor after eol when
                                              restarting edit after CTRL-O */
-EXTERN char_u   *edit_submode INIT(= NULL); /* msg for CTRL-X submode */
-EXTERN char_u   *edit_submode_pre INIT(= NULL); /* prepended to edit_submode */
-EXTERN char_u   *edit_submode_extra INIT(= NULL); /* appended to edit_submode */
-EXTERN hlf_T edit_submode_highl;        /* highl. method for extra info */
-EXTERN int ctrl_x_mode INIT(= 0);       /* Which Ctrl-X mode are we in? */
+EXTERN char_u *edit_submode INIT(= NULL);  // msg for CTRL-X submode
+EXTERN char_u *edit_submode_pre INIT(= NULL);  // prepended to edit_submode
+EXTERN char_u *edit_submode_extra INIT(= NULL);  // appended to edit_submode
+EXTERN hlf_T edit_submode_highl;        // highl. method for extra info
 
 EXTERN int no_abbr INIT(= TRUE);        /* TRUE when no abbreviations loaded */
 
diff --git a/src/nvim/search.c b/src/nvim/search.c
index b6d666cbe8..1f9ac93df0 100644
--- a/src/nvim/search.c
+++ b/src/nvim/search.c
@@ -352,7 +352,7 @@ int ignorecase_opt(char_u *pat, int ic_in, int scs)
 {
   int ic = ic_in;
   if (ic && !no_smartcase && scs
-      && !(ctrl_x_mode && curbuf->b_p_inf)
+      && !(ctrl_x_mode_not_default() && curbuf->b_p_inf)
       ) {
     ic = !pat_has_uppercase(pat);
   }
diff --git a/src/nvim/state.c b/src/nvim/state.c
index e6eeaac8d0..7c7d035366 100644
--- a/src/nvim/state.c
+++ b/src/nvim/state.c
@@ -143,7 +143,7 @@ char *get_mode(void)
       }
       if (ins_compl_active()) {
         buf[1] = 'c';
-      } else if (ctrl_x_mode == 1) {
+      } else if (ctrl_x_mode_not_defined_yet()) {
         buf[1] = 'x';
       }
     }
diff --git a/src/nvim/testdir/test_edit.vim b/src/nvim/testdir/test_edit.vim
index 7f3994300f..48376d7922 100644
--- a/src/nvim/testdir/test_edit.vim
+++ b/src/nvim/testdir/test_edit.vim
@@ -643,11 +643,11 @@ func! Test_edit_CTRL_L()
   call feedkeys("cct\<c-x>\<c-l>\<c-n>\<esc>", 'tnix')
   call assert_equal(['one', 'two', 'three', 't', '', '', ''], getline(1, '$'))
   call feedkeys("cct\<c-x>\<c-l>\<c-n>\<c-n>\<esc>", 'tnix')
-  call assert_equal(['one', 'two', 'three', 't', '', '', ''], getline(1, '$'))
-  call feedkeys("cct\<c-x>\<c-l>\<c-n>\<c-n>\<c-n>\<esc>", 'tnix')
   call assert_equal(['one', 'two', 'three', 'two', '', '', ''], getline(1, '$'))
-  call feedkeys("cct\<c-x>\<c-l>\<c-n>\<c-n>\<c-n>\<c-n>\<esc>", 'tnix')
+  call feedkeys("cct\<c-x>\<c-l>\<c-n>\<c-n>\<c-n>\<esc>", 'tnix')
   call assert_equal(['one', 'two', 'three', 'three', '', '', ''], getline(1, '$'))
+  call feedkeys("cct\<c-x>\<c-l>\<c-n>\<c-n>\<c-n>\<c-n>\<esc>", 'tnix')
+  call assert_equal(['one', 'two', 'three', 't', '', '', ''], getline(1, '$'))
   call feedkeys("cct\<c-x>\<c-l>\<c-p>\<esc>", 'tnix')
   call assert_equal(['one', 'two', 'three', 'two', '', '', ''], getline(1, '$'))
   call feedkeys("cct\<c-x>\<c-l>\<c-p>\<c-p>\<esc>", 'tnix')
@@ -1408,7 +1408,6 @@ func Test_edit_complete_very_long_name()
   let save_columns = &columns
   " Need at least about 1100 columns to reproduce the problem.
   set columns=2000
-  call assert_equal(2000, &columns)
   set noswapfile
 
   let longfilename = longdirname . '/' . repeat('a', 255)
diff --git a/src/nvim/testdir/test_ins_complete.vim b/src/nvim/testdir/test_ins_complete.vim
index d3429617d0..071e82579e 100644
--- a/src/nvim/testdir/test_ins_complete.vim
+++ b/src/nvim/testdir/test_ins_complete.vim
@@ -249,3 +249,14 @@ func Test_omni_dash()
   delfunc Omni
   set omnifunc=
 endfunc
+
+" Check that when using feedkeys() typeahead does not interrupt searching for
+" completions.
+func Test_compl_feedkeys()
+  new
+  set completeopt=menuone,noselect
+  call feedkeys("ajump ju\<C-X>\<C-N>\<C-P>\<ESC>", "tx")
+  call assert_equal("jump jump", getline(1))
+  bwipe!
+  set completeopt&
+endfunc
diff --git a/src/nvim/testdir/test_mapping.vim b/src/nvim/testdir/test_mapping.vim
index 84a118aef2..9f253604ed 100644
--- a/src/nvim/testdir/test_mapping.vim
+++ b/src/nvim/testdir/test_mapping.vim
@@ -187,9 +187,32 @@ func Test_map_cursor()
   imapclear
 endfunc
 
+func Test_map_cursor_ctrl_gU()
+  " <c-g>U<cursor> works only within a single line
+  nnoremap c<* *Ncgn<C-r>"<C-G>U<S-Left>
+  call setline(1, ['foo', 'foobar', '', 'foo'])
+  call cursor(1,2)
+  call feedkeys("c<*PREFIX\<esc>.", 'xt')
+  call assert_equal(['PREFIXfoo', 'foobar', '', 'PREFIXfoo'], getline(1,'$'))
+  " break undo manually
+  set ul=1000
+  exe ":norm! uu"
+  call assert_equal(['foo', 'foobar', '', 'foo'], getline(1,'$'))
+
+  " Test that it does not work if the cursor moves to the previous line
+  " 2 times <S-Left> move to the previous line
+  nnoremap c<* *Ncgn<C-r>"<C-G>U<S-Left><C-G>U<S-Left>
+  call setline(1, ['', ' foo', 'foobar', '', 'foo'])
+  call cursor(2,3)
+  call feedkeys("c<*PREFIX\<esc>.", 'xt')
+  call assert_equal(['PREFIXPREFIX', ' foo', 'foobar', '', 'foo'], getline(1,'$'))
+  nmapclear
+endfunc
+
+
 " This isn't actually testing a mapping, but similar use of CTRL-G U as above.
 func Test_break_undo()
-  :set whichwrap=<,>,[,]
+  set whichwrap=<,>,[,]
   call feedkeys("G4o2k", "xt")
   exe ":norm! iTest3: text with a (parenthesis here\<C-G>U\<Right>new line here\<esc>\<up>\<up>."
   call assert_equal('new line here', getline(line('$') - 3))
diff --git a/src/nvim/testdir/test_popup.vim b/src/nvim/testdir/test_popup.vim
index 96f4bfc71b..557f60751c 100644
--- a/src/nvim/testdir/test_popup.vim
+++ b/src/nvim/testdir/test_popup.vim
@@ -641,7 +641,7 @@ func Test_popup_and_preview_autocommand()
   norm! gt
   call assert_equal(0, &previewwindow)
   norm! gT
-  call assert_equal(12, tabpagenr('$'))
+  call assert_equal(10, tabpagenr('$'))
   tabonly
   pclose
   augroup MyBufAdd