summaryrefslogtreecommitdiff
path: root/src/regexp.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-09-04 15:54:55 +0200
committerBram Moolenaar <Bram@vim.org>2019-09-04 15:54:55 +0200
commitb005cd80cfda591be95146024d9b97eef383500f (patch)
treece7d5ac25d5c8e3442828130c180e04820565d29 /src/regexp.c
parent1e1d30048e722906a13665bd6c3c24c87eb2fe25 (diff)
downloadvim-git-b005cd80cfda591be95146024d9b97eef383500f.tar.gz
patch 8.1.1979: code for handling file names is spread outv8.1.1979
Problem: Code for handling file names is spread out. Solution: Move code to new filepath.c file. Graduate FEAT_MODIFY_FNAME.
Diffstat (limited to 'src/regexp.c')
-rw-r--r--src/regexp.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/regexp.c b/src/regexp.c
index 4a47f1dfa..c21e0e62f 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -7210,7 +7210,7 @@ typedef struct {
static regsubmatch_T rsm; /* can only be used when can_f_submatch is TRUE */
#endif
-#if defined(FEAT_MODIFY_FNAME) || defined(FEAT_EVAL) || defined(PROTO)
+#ifdef FEAT_EVAL
/*
* Put the submatches in "argv[0]" which is a list passed into call_func() by
@@ -7254,6 +7254,7 @@ clear_submatch_list(staticList10_T *sl)
for (i = 0; i < 10; ++i)
vim_free(sl->sl_items[i].li_tv.vval.v_string);
}
+#endif
/*
* vim_regsub() - perform substitutions after a vim_regexec() or
@@ -7305,7 +7306,6 @@ vim_regsub(
return result;
}
-#endif
int
vim_regsub_multi(
@@ -8206,8 +8206,6 @@ vim_regexec(regmatch_T *rmp, char_u *line, colnr_T col)
return vim_regexec_string(rmp, line, col, FALSE);
}
-#if defined(FEAT_MODIFY_FNAME) || defined(FEAT_EVAL) \
- || defined(FIND_REPLACE_DIALOG) || defined(PROTO)
/*
* Like vim_regexec(), but consider a "\n" in "line" to be a line break.
* Note: "rmp->regprog" may be freed and changed.
@@ -8218,7 +8216,6 @@ vim_regexec_nl(regmatch_T *rmp, char_u *line, colnr_T col)
{
return vim_regexec_string(rmp, line, col, TRUE);
}
-#endif
/*
* Match a regexp against multiple lines.