summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ex_cmds.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 10c8e617c9..14045267da 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -4975,6 +4975,8 @@ ex_global(exarg_T *eap)
// a match on this line?
match = vim_regexec_multi(&regmatch, curwin, curbuf, lnum,
(colnr_T)0, NULL, NULL);
+ if (regmatch.regprog == NULL)
+ break; // re-compiling regprog failed
if ((type == 'g' && match) || (type == 'v' && !match))
{
ml_setmarked(lnum);
diff --git a/src/version.c b/src/version.c
index a77aa046f3..05b8120a98 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3883,
+/**/
3882,
/**/
3881,