diff options
| author | Michael Reed <Pyrohh@users.noreply.github.com> | 2015-07-19 15:39:03 -0400 |
|---|---|---|
| committer | Michael Reed <Pyrohh@users.noreply.github.com> | 2015-07-19 15:39:03 -0400 |
| commit | 259db27aefba280a9c154017b8e852c6d70abdfc (patch) | |
| tree | 2e1a467ff7798a9e52f0851f4ae894cdb19d8a37 /src/nvim/regexp.c | |
| parent | fcb79ffc40b93d5e0d165e1d001d073c83b8617e (diff) | |
| parent | 85b7ea9a8770c42bf2cadb1d3fa605b58d82d7cb (diff) | |
| download | rneovim-259db27aefba280a9c154017b8e852c6d70abdfc.tar.gz rneovim-259db27aefba280a9c154017b8e852c6d70abdfc.tar.bz2 rneovim-259db27aefba280a9c154017b8e852c6d70abdfc.zip | |
Merge pull request #2943 from Pyrohh/rm-posix
[RDY] Remove POSIX 'cpoptions'
Reviewed-by: Felipe Morales <hel.sheep@gmail.com>
Reviewed-by: Marco Hinz <mh.codebro@gmail.com>
Diffstat (limited to 'src/nvim/regexp.c')
| -rw-r--r-- | src/nvim/regexp.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index 3ae3f46db3..4724a07895 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -1120,12 +1120,10 @@ static int get_coll_element(char_u **pp) } static int reg_cpo_lit; /* 'cpoptions' contains 'l' flag */ -static int reg_cpo_bsl; /* 'cpoptions' contains '\' flag */ static void get_cpo_flags(void) { reg_cpo_lit = vim_strchr(p_cpo, CPO_LITERAL) != NULL; - reg_cpo_bsl = vim_strchr(p_cpo, CPO_BACKSL) != NULL; } /* @@ -1149,7 +1147,6 @@ static char_u *skip_anyof(char_u *p) if (*p != ']' && *p != NUL) mb_ptr_adv(p); } else if (*p == '\\' - && !reg_cpo_bsl && (vim_strchr(REGEXP_INRANGE, p[1]) != NULL || (!reg_cpo_lit && vim_strchr(REGEXP_ABBR, p[1]) != NULL))) p += 2; @@ -2222,7 +2219,7 @@ collection: } /* Handle \o40, \x20 and \u20AC style sequences */ - if (endc == '\\' && !reg_cpo_lit && !reg_cpo_bsl) + if (endc == '\\' && !reg_cpo_lit) endc = coll_get_char(); if (startc > endc) @@ -2245,10 +2242,8 @@ collection: * Only "\]", "\^", "\]" and "\\" are special in Vi. Vim * accepts "\t", "\e", etc., but only when the 'l' flag in * 'cpoptions' is not included. - * Posix doesn't recognize backslash at all. */ else if (*regparse == '\\' - && !reg_cpo_bsl && (vim_strchr(REGEXP_INRANGE, regparse[1]) != NULL || (!reg_cpo_lit && vim_strchr(REGEXP_ABBR, |