patch 8.2.3033: no error when using alpha delimiter with :global
Problem: No error when using alpha delimiter with :global.
Solution: Check the delimiter like with :substitute. (closes #8415)
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 614d41d..d8c5a12 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3643,6 +3643,17 @@
return p;
}
+ static int
+check_regexp_delim(int c)
+{
+ if (isalpha(c))
+ {
+ emsg(_("E146: Regular expressions can't be delimited by letters"));
+ return FAIL;
+ }
+ return OK;
+}
+
/*
* Perform a substitution from line eap->line1 to line eap->line2 using the
* command pointed to by eap->arg which should be of the form:
@@ -3705,11 +3716,9 @@
&& vim_strchr((char_u *)"0123456789cegriIp|\"", *cmd) == NULL)
{
// don't accept alphanumeric for separator
- if (isalpha(*cmd))
- {
- emsg(_("E146: Regular expressions can't be delimited by letters"));
+ if (check_regexp_delim(*cmd) == FAIL)
return;
- }
+
/*
* undocumented vi feature:
* "\/sub/" and "\?sub?" use last used search pattern (almost like
@@ -4909,6 +4918,10 @@
emsg(_("E148: Regular expression missing from global"));
return;
}
+ else if (check_regexp_delim(*cmd) == FAIL)
+ {
+ return;
+ }
else
{
delim = *cmd; // get the delimiter
diff --git a/src/testdir/test_global.vim b/src/testdir/test_global.vim
index 4a01be4..48753cf 100644
--- a/src/testdir/test_global.vim
+++ b/src/testdir/test_global.vim
@@ -83,4 +83,8 @@
close!
endfunc
+func Test_wrong_delimiter()
+ call assert_fails('g x^bxd', 'E146:')
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index a6e483e..d8d033a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3033,
+/**/
3032,
/**/
3031,