'cpoptions': Remove "*" flag #2554

The "*" flag in 'cpoptions' makes the command :* execute the contents of
a register. Removed because
  1. the same functionality exists as :@
  2. it hides :* as a useful command-line shortcut for :'<,'>
  3. unlike :@ it cannot be used with the * register

Helped-by: Michael Reed <m.reed@mykolab.com>

4 files changed, 18 insertions, 26 deletions

diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 62c2d4ac98..8cfb2ce2a0 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -4833,18 +4833,18 @@ int find_help_tags(char_u *arg, int *num_matches, char_u ***matches, int keep_la
 {
   char_u      *s, *d;
   int i;
-  static char *(mtable[]) = {"*", "g*", "[*", "]*", ":*",
+  static char *(mtable[]) = {"*", "g*", "[*", "]*",
                              "/*", "/\\*", "\"*", "**",
-                             "cpo-*", "/\\(\\)", "/\\%(\\)",
+                             "/\\(\\)", "/\\%(\\)",
                              "?", ":?", "?<CR>", "g?", "g?g?", "g??", "z?",
                              "/\\?", "/\\z(\\)", "\\=", ":s\\=",
                              "[count]", "[quotex]", "[range]",
                              "[pattern]", "\\|", "\\%$",
                              "s/\\~", "s/\\U", "s/\\L",
                              "s/\\1", "s/\\2", "s/\\3", "s/\\9"};
-  static char *(rtable[]) = {"star", "gstar", "[star", "]star", ":star",
+  static char *(rtable[]) = {"star", "gstar", "[star", "]star",
                              "/star", "/\\\\star", "quotestar", "starstar",
-                             "cpo-star", "/\\\\(\\\\)", "/\\\\%(\\\\)",
+                             "/\\\\(\\\\)", "/\\\\%(\\\\)",
                              "?", ":?", "?<CR>", "g?", "g?g?", "g??", "z?",
                              "/\\\\?", "/\\\\z(\\\\)", "\\\\=", ":s\\\\=",
                              "\\[count]", "\\[quotex]", "\\[range]",
diff --git a/src/nvim/ex_cmds.lua b/src/nvim/ex_cmds.lua
index 5f60b8cb09..011b3ce611 100644
--- a/src/nvim/ex_cmds.lua
+++ b/src/nvim/ex_cmds.lua
@@ -3137,13 +3137,6 @@ return {
     func='do_sub',
   },
   {
-    command='*',
-    enum='CMD_star',
-    flags=bit.bor(RANGE, WHOLEFOLD, EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
-    func='ex_at',
-  },
-  {
     command='<',
     enum='CMD_lshift',
     flags=bit.bor(RANGE, WHOLEFOLD, COUNT, EXFLAGS, TRLBAR, CMDWIN, MODIFY),
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 289bb85f4d..1b616bb579 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -1489,8 +1489,9 @@ static char_u * do_one_cmd(char_u **cmdlinep,
 
   cmd = ea.cmd;
   ea.cmd = skip_range(ea.cmd, NULL);
-  if (*ea.cmd == '*' && vim_strchr(p_cpo, CPO_STAR) == NULL)
+  if (*ea.cmd == '*') {
     ea.cmd = skipwhite(ea.cmd + 1);
+  }
   p = find_command(&ea, NULL);
 
   /*
@@ -1605,7 +1606,7 @@ static char_u * do_one_cmd(char_u **cmdlinep,
         ++ea.addr_count;
       }
       /* '*' - visual area */
-      else if (*ea.cmd == '*' && vim_strchr(p_cpo, CPO_STAR) == NULL) {
+      else if (*ea.cmd == '*') {
         pos_T       *fp;
 
         if (ea.addr_type != ADDR_LINES) {
@@ -2373,7 +2374,7 @@ static char_u *find_command(exarg_T *eap, int *full)
         ++p;
 
     /* check for non-alpha command */
-    if (p == eap->cmd && vim_strchr((char_u *)"@*!=><&~#", *p) != NULL)
+    if (p == eap->cmd && vim_strchr((char_u *)"@!=><&~#", *p) != NULL)
       ++p;
     len = (int)(p - eap->cmd);
     if (*eap->cmd == 'd' && (p[-1] == 'l' || p[-1] == 'p')) {
@@ -4096,11 +4097,10 @@ void separate_nextcmd(exarg_T *eap)
       (void)skip_expr(&p);
     }
     /* Check for '"': start of comment or '|': next command */
-    /* :@" and :*" do not start a comment!
+    /* :@" does not start a comment!
      * :redir @" doesn't either. */
     else if ((*p == '"' && !(eap->argt & NOTRLCOM)
-              && ((eap->cmdidx != CMD_at && eap->cmdidx != CMD_star)
-                  || p != eap->arg)
+              && (eap->cmdidx != CMD_at || p != eap->arg)
               && (eap->cmdidx != CMD_redir
                   || p != eap->arg + 1 || p[-1] != '@'))
              || *p == '|' || *p == '\n') {
@@ -7144,20 +7144,20 @@ static void ex_join(exarg_T *eap)
 }
 
 /*
- * ":[addr]@r" or ":[addr]*r": execute register
+ * ":[addr]@r": execute register
  */
 static void ex_at(exarg_T *eap)
 {
-  int c;
   int prev_len = typebuf.tb_len;
 
   curwin->w_cursor.lnum = eap->line2;
 
-
-  /* get the register name.  No name means to use the previous one */
-  c = *eap->arg;
-  if (c == NUL || (c == '*' && *eap->cmd == '*'))
+  // Get the register name. No name means use the previous one.
+  int c = *eap->arg;
+  if (c == NUL) {
     c = '@';
+  }
+
   /* Put the register in the typeahead buffer with the "silent" flag. */
   if (do_execreg(c, TRUE, vim_strchr(p_cpo, CPO_EXECBUF) != NULL, TRUE)
       == FAIL) {
diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h
index 278b3f0872..daecfcdb8b 100644
--- a/src/nvim/option_defs.h
+++ b/src/nvim/option_defs.h
@@ -126,7 +126,6 @@
 #define CPO_DOLLAR      '$'
 #define CPO_FILTER      '!'
 #define CPO_MATCH       '%'
-#define CPO_STAR        '*'     /* ":*" means ":@" */
 #define CPO_PLUS        '+'     /* ":write file" resets 'modified' */
 #define CPO_MINUS       '-'     /* "9-" fails at and before line 9 */
 #define CPO_SPECI       '<'     /* don't recognize <> in mappings */
@@ -143,9 +142,9 @@
                                  * cursor would not move */
 /* default values for Vim, Vi and POSIX */
 #define CPO_VIM         "aABceFs"
-#define CPO_VI          "aAbBcCdDeEfFiIjJkKlLmMnoOpPqrRsStuvWxXyZ$!%*-+<>;"
+#define CPO_VI          "aAbBcCdDeEfFiIjJkKlLmMnoOpPqrRsStuvWxXyZ$!%-+<>;"
 #define CPO_ALL \
-  "aAbBcCdDeEfFiIjJkKlLmMnoOpPqrRsStuvWxXyZ$!%*-+<>#{|&/\\.;"
+  "aAbBcCdDeEfFiIjJkKlLmMnoOpPqrRsStuvWxXyZ$!%-+<>#{|&/\\.;"
 
 /* characters for p_ww option: */
 #define WW_ALL          "bshl<>[],~"