1 files changed, 59 insertions, 27 deletions

diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index cbe7c1a231..d6976bcb8f 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -1702,9 +1702,9 @@ static char_u * do_one_cmd(char_u **cmdlinep,
     p = vim_strnsave(ea.cmd, p - ea.cmd);
     int ret = apply_autocmds(EVENT_CMDUNDEFINED, p, p, TRUE, NULL);
     xfree(p);
-    if (ret && !aborting()) {
-      p = find_command(&ea, NULL);
-    }
+    // If the autocommands did something and didn't cause an error, try
+    // finding the command again.
+    p = (ret && !aborting()) ? find_command(&ea, NULL) : NULL;
   }
 
   if (p == NULL) {
@@ -2348,8 +2348,11 @@ static char_u *find_command(exarg_T *eap, int *full)
     eap->cmdidx = CMD_k;
     ++p;
   } else if (p[0] == 's'
-             && ((p[1] == 'c' && p[2] != 's' && p[2] != 'r'
-                  && p[3] != 'i' && p[4] != 'p')
+             && ((p[1] == 'c'
+                  && (p[2] == NUL
+                      || (p[2] != 's' && p[2] != 'r'
+                          && (p[3] == NUL
+                              || (p[3] != 'i' && p[4] != 'p')))))
                  || p[1] == 'g'
                  || (p[1] == 'i' && p[2] != 'm' && p[2] != 'l' && p[2] != 'g')
                  || p[1] == 'I'
@@ -5656,8 +5659,13 @@ static void ex_quit(exarg_T *eap)
       || (only_one_window() && check_changed_any(eap->forceit))) {
     not_exiting();
   } else {
-    if (only_one_window()) {
-      // quit last window
+    // quit last window
+    // Note: only_one_window() returns true, even so a help window is
+    // still open. In that case only quit, if no address has been
+    // specified. Example:
+    // :h|wincmd w|1q     - don't quit
+    // :h|wincmd w|q      - quit
+    if (only_one_window() && (firstwin == lastwin || eap->addr_count == 0)) {
       getout(0);
     }
     /* close window; may free buffer */
@@ -6345,7 +6353,7 @@ static void ex_tabnext(exarg_T *eap)
  */
 static void ex_tabmove(exarg_T *eap)
 {
-  int tab_number = 9999;
+  int tab_number;
 
   if (eap->arg && *eap->arg != NUL) {
     char_u *p = eap->arg;
@@ -6361,17 +6369,35 @@ static void ex_tabmove(exarg_T *eap)
     } else
       p = eap->arg;
 
-    if (p == skipdigits(p)) {
-      /* No numbers as argument. */
-      eap->errmsg = e_invarg;
-      return;
+    if (relative == 0) {
+      if (STRCMP(p, "$") == 0) {
+        tab_number = LAST_TAB_NR;
+      } else if (p == skipdigits(p)) {
+        // No numbers as argument.
+        eap->errmsg = e_invarg;
+        return;
+      } else {
+        tab_number = getdigits(&p);
+      }
+    } else {
+      if (*p != NUL) {
+        tab_number = getdigits(&p);
+      } else {
+        tab_number = 1;
+      }
+      tab_number = tab_number * relative + tabpage_index(curtab);
+      if (relative == -1) {
+        --tab_number;
+      }
     }
-
-    tab_number = getdigits_int(&p);
-    if (relative != 0)
-      tab_number = tab_number * relative + tabpage_index(curtab) - 1; ;
-  } else if (eap->addr_count != 0)
+  } else if (eap->addr_count != 0) {
     tab_number = eap->line2;
+    if (**eap->cmdlinep == '-') {
+      --tab_number;
+    }
+  } else {
+    tab_number = LAST_TAB_NR;
+  }
 
   tabpage_move(tab_number);
 }
@@ -8257,16 +8283,22 @@ static char_u *arg_all(void)
           retval[len] = ' ';
         ++len;
       }
-      for (; *p != NUL; ++p) {
-        if (*p == ' ' || *p == '\\') {
-          /* insert a backslash */
-          if (retval != NULL)
+      for (; *p != NUL; p++) {
+        if (*p == ' '
+#ifndef BACKSLASH_IN_FILENAME
+            || *p == '\\'
+#endif
+            ) {
+          // insert a backslash
+          if (retval != NULL) {
             retval[len] = '\\';
-          ++len;
+          }
+          len++;
         }
-        if (retval != NULL)
+        if (retval != NULL) {
           retval[len] = *p;
-        ++len;
+        }
+        len++;
       }
     }
 
@@ -8345,8 +8377,7 @@ makeopens (
 {
   int only_save_windows = TRUE;
   int nr;
-  int cnr = 1;
-  int restore_size = TRUE;
+  int restore_size = true;
   win_T       *wp;
   char_u      *sname;
   win_T       *edited_win = NULL;
@@ -8463,7 +8494,8 @@ makeopens (
   tab_firstwin = firstwin;      /* first window in tab page "tabnr" */
   tab_topframe = topframe;
   for (tabnr = 1;; ++tabnr) {
-    int need_tabnew = FALSE;
+    int need_tabnew = false;
+    int cnr = 1;
 
     if ((ssop_flags & SSOP_TABPAGES)) {
       tabpage_T *tp = find_tabpage(tabnr);