1 files changed, 30 insertions, 29 deletions

diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index beae55b8a8..667ce1e779 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -165,10 +165,6 @@ static int compl_restarting = FALSE;            /* don't insert match */
  * FALSE the word to be completed must be located. */
 static int compl_started = FALSE;
 
-/* Set when doing something for completion that may call edit() recursively,
- * which is not allowed. */
-static int compl_busy = FALSE;
-
 static int compl_matches = 0;
 static char_u     *compl_pattern = NULL;
 static int compl_direction = FORWARD;
@@ -203,7 +199,7 @@ typedef struct insert_state {
   int did_restart_edit;              // remember if insert mode was restarted
                                      // after a ctrl+o
   bool nomove;
-  uint8_t *ptr;
+  char_u *ptr;
 } InsertState;
 
 
@@ -274,8 +270,8 @@ static void insert_enter(InsertState *s)
       s->ptr = (char_u *)"i";
     }
 
-    set_vim_var_string(VV_INSERTMODE, s->ptr, 1);
-    set_vim_var_string(VV_CHAR, NULL, -1);      /* clear v:char */
+    set_vim_var_string(VV_INSERTMODE, (char *) s->ptr, 1);
+    set_vim_var_string(VV_CHAR, NULL, -1);
     apply_autocmds(EVENT_INSERTENTER, NULL, NULL, false, curbuf);
 
     // Make sure the cursor didn't move.  Do call check_cursor_col() in
@@ -1819,7 +1815,7 @@ static bool del_char_after_col(int limit_col)
     if (*get_cursor_pos_ptr() == NUL || curwin->w_cursor.col == ecol) {
       return false;
     }
-    del_bytes((long)(ecol - curwin->w_cursor.col), false, true);
+    del_bytes(ecol - curwin->w_cursor.col, false, true);
   } else {
     del_char(false);
   }
@@ -2362,13 +2358,13 @@ void set_completion(colnr_T startcol, list_T *list)
   int save_w_wrow = curwin->w_wrow;
 
   compl_curr_match = compl_first_match;
-  if (compl_no_insert) {
+  if (compl_no_insert || compl_no_select) {
     ins_complete(K_DOWN, false);
-  } else {
-    ins_complete(Ctrl_N, false);
     if (compl_no_select) {
-      ins_complete(Ctrl_P, false);
+      ins_complete(K_UP, false);
     }
+  } else {
+    ins_complete(Ctrl_N, false);
   }
 
   // Lazily show the popup menu, unless we got interrupted.
@@ -3088,8 +3084,10 @@ static bool ins_compl_prep(int c)
 
   /* Ignore end of Select mode mapping and mouse scroll buttons. */
   if (c == K_SELECT || c == K_MOUSEDOWN || c == K_MOUSEUP
-      || c == K_MOUSELEFT || c == K_MOUSERIGHT)
+      || c == K_MOUSELEFT || c == K_MOUSERIGHT || c == K_EVENT
+      || c == K_FOCUSGAINED || c == K_FOCUSLOST) {
     return retval;
+  }
 
   /* Set "compl_get_longest" when finding the first matches. */
   if (ctrl_x_mode == CTRL_X_NOT_DEFINED_YET
@@ -4241,9 +4239,10 @@ void ins_compl_check_keys(int frequency)
 static int ins_compl_key2dir(int c)
 {
   if (c == Ctrl_P || c == Ctrl_L
-      || (pum_visible() && (c == K_PAGEUP || c == K_KPAGEUP
-                            || c == K_S_UP || c == K_UP)))
+      || c == K_PAGEUP || c == K_KPAGEUP
+      || c == K_S_UP || c == K_UP) {
     return BACKWARD;
+  }
   return FORWARD;
 }
 
@@ -7240,15 +7239,15 @@ static void ins_insert(int replaceState)
     return;
   }
 
-  set_vim_var_string(VV_INSERTMODE,
-      (char_u *)((State & REPLACE_FLAG) ? "i" :
-                 replaceState == VREPLACE ? "v" :
-                 "r"), 1);
-  apply_autocmds(EVENT_INSERTCHANGE, NULL, NULL, FALSE, curbuf);
-  if (State & REPLACE_FLAG)
+  set_vim_var_string(VV_INSERTMODE, ((State & REPLACE_FLAG) ? "i" :
+                                     replaceState == VREPLACE ? "v" :
+                                     "r"), 1);
+  apply_autocmds(EVENT_INSERTCHANGE, NULL, NULL, false, curbuf);
+  if (State & REPLACE_FLAG) {
     State = INSERT | (State & LANGMAP);
-  else
+  } else {
     State = replaceState | (State & LANGMAP);
+  }
   AppendCharToRedobuff(K_INS);
   showmode();
   ui_cursor_shape();            /* may show different cursor shape */
@@ -7742,6 +7741,8 @@ static void ins_mousescroll(int dir)
             (long)(curwin->w_botline - curwin->w_topline));
       else
         scroll_redraw(dir, 3L);
+    } else {
+        mouse_scroll_horiz(dir);
     }
     did_scroll = TRUE;
   }
@@ -8481,22 +8482,22 @@ static colnr_T get_nolist_virtcol(void)
  */
 static char_u *do_insert_char_pre(int c)
 {
-  char_u buf[MB_MAXBYTES + 1];
+  char buf[MB_MAXBYTES + 1];
 
   // Return quickly when there is nothing to do.
   if (!has_event(EVENT_INSERTCHARPRE)) {
     return NULL;
   }
   if (has_mbyte) {
-    buf[(*mb_char2bytes)(c, buf)] = NUL;
+    buf[(*mb_char2bytes)(c, (char_u *) buf)] = NUL;
   } else {
     buf[0] = c;
     buf[1] = NUL;
   }
 
-  /* Lock the text to avoid weird things from happening. */
-  ++textlock;
-  set_vim_var_string(VV_CHAR, buf, -1);    /* set v:char */
+  // Lock the text to avoid weird things from happening.
+  textlock++;
+  set_vim_var_string(VV_CHAR, buf, -1);
 
   char_u *res = NULL;
   if (apply_autocmds(EVENT_INSERTCHARPRE, NULL, NULL, FALSE, curbuf)) {
@@ -8507,8 +8508,8 @@ static char_u *do_insert_char_pre(int c)
       res = vim_strsave(get_vim_var_str(VV_CHAR));
   }
 
-  set_vim_var_string(VV_CHAR, NULL, -1);    /* clear v:char */
-  --textlock;
+  set_vim_var_string(VV_CHAR, NULL, -1);
+  textlock--;
 
   return res;
 }