Merge pull request #1727 from fwalch/small-patches

vim-patch: Multiple small patches

src/nvim/ex_getln.c

@@ -627,11 +627,13 @@ getcmdline (
     }
 
     if (c == cedit_key || c == K_CMDWIN) {
+      if (ex_normal_busy == 0 && got_int == FALSE) {
         /*
          * Open a window to edit the command line (and history).
          */
         c = ex_window();
         some_key_typed = TRUE;
+      }
     } else
       c = do_digraph(c);
 

src/nvim/getchar.c

@@ -2980,8 +2980,12 @@ do_map (
   }
 
   if (maptype == 1) {                       /* delete entry */
-    if (!did_it)
+    if (!did_it) {
       retval = 2;                           /* no match */
+    } else if (*keys == Ctrl_C) {
+      /* If CTRL-C has been unmapped, reuse it for Interrupting. */
+      mapped_ctrl_c = FALSE;
+    }
     goto theend;
   }
 
@@ -3005,7 +3009,7 @@ do_map (
    */
   mp = xmalloc(sizeof(mapblock_T));
 
-  /* If CTRL-C has been mapped, don't always use it for Interrupting */
+  /* If CTRL-C has been mapped, don't always use it for Interrupting. */
   if (*keys == Ctrl_C)
     mapped_ctrl_c = TRUE;
 

src/nvim/move.c

@@ -146,6 +146,15 @@ void update_topline(void)
   if (!screen_valid(TRUE))
     return;
 
+  // If the window height is zero, just use the cursor line.
+  if (curwin->w_height == 0) {
+    curwin->w_topline = curwin->w_cursor.lnum;
+    curwin->w_botline = curwin->w_topline;
+    curwin->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP;
+    curwin->w_scbind_pos = 1;
+    return;
+  }
+
   check_cursor_moved(curwin);
   if (curwin->w_valid & VALID_TOPLINE)
     return;

src/nvim/option.c

@@ -2202,6 +2202,8 @@ set_options_default (
   FOR_ALL_TAB_WINDOWS(tp, wp) {
     win_comp_scroll(wp);
   }
+
+  parse_cino(curbuf);
 }
 
 /// Set the Vi-default value of a string option.

src/nvim/version.c

@@ -270,7 +270,7 @@ static int included_patches[] = {
   //471 NA
   470,
   //469 NA
-  //468,
+  468,
   467,
   //465 NA
   //464 NA
@@ -279,7 +279,7 @@ static int included_patches[] = {
   //461 NA
   //460 NA
   //459 NA
-  //458,
+  458,
   457,
   456,
   455,
@@ -296,10 +296,10 @@ static int included_patches[] = {
   444,
   //443,
   442,
-  //441,
+  441,
   440,
   439,
-  //438,
+  438,
   437,
   436,
   435,