1 files changed, 30 insertions, 20 deletions

diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 3fce5d5530..b1d37cfb31 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -2679,16 +2679,25 @@ set_one_cmd_context (
     p = cmd + 1;
   } else {
     p = cmd;
-    while (ASCII_ISALPHA(*p) || *p == '*')        /* Allow * wild card */
-      ++p;
-    /* check for non-alpha command */
-    if (p == cmd && vim_strchr((char_u *)"@*!=><&~#", *p) != NULL)
-      ++p;
-    /* for python 3.x: ":py3*" commands completion */
+    while (ASCII_ISALPHA(*p) || *p == '*') {  // Allow * wild card
+      p++;
+    }
+    // a user command may contain digits
+    if (ASCII_ISUPPER(cmd[0])) {
+      while (ASCII_ISALNUM(*p) || *p == '*') {
+        p++;
+      }
+    }
+    // for python 3.x: ":py3*" commands completion
     if (cmd[0] == 'p' && cmd[1] == 'y' && p == cmd + 2 && *p == '3') {
-      ++p;
-      while (ASCII_ISALPHA(*p) || *p == '*')
-        ++p;
+      p++;
+      while (ASCII_ISALPHA(*p) || *p == '*') {
+        p++;
+      }
+    }
+    // check for non-alpha command
+    if (p == cmd && vim_strchr((char_u *)"@*!=><&~#", *p) != NULL) {
+      p++;
     }
     len = (int)(p - cmd);
 
@@ -2702,9 +2711,11 @@ set_one_cmd_context (
               (size_t)len) == 0)
         break;
 
-    if (cmd[0] >= 'A' && cmd[0] <= 'Z')
-      while (ASCII_ISALNUM(*p) || *p == '*')            /* Allow * wild card */
-        ++p;
+    if (cmd[0] >= 'A' && cmd[0] <= 'Z') {
+      while (ASCII_ISALNUM(*p) || *p == '*') {  // Allow * wild card
+        p++;
+      }
+    }
   }
 
   /*
@@ -8774,19 +8785,18 @@ static int ses_do_frame(frame_T *fr)
   return FALSE;
 }
 
-/*
- * Return non-zero if window "wp" is to be stored in the Session.
- */
+/// Return non-zero if window "wp" is to be stored in the Session.
 static int ses_do_win(win_T *wp)
 {
   if (wp->w_buffer->b_fname == NULL
-      /* When 'buftype' is "nofile" can't restore the window contents. */
-      || bt_nofile(wp->w_buffer)
-      )
+      // When 'buftype' is "nofile" can't restore the window contents.
+      || (!wp->w_buffer->terminal && bt_nofile(wp->w_buffer))) {
     return ssop_flags & SSOP_BLANK;
-  if (wp->w_buffer->b_help)
+  }
+  if (wp->w_buffer->b_help) {
     return ssop_flags & SSOP_HELP;
-  return TRUE;
+  }
+  return true;
 }
 
 /*