diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2018-09-21 08:20:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-21 08:20:20 +0200 |
commit | ad6bbe44683cf936ec2268ee89e8e1c22f538ecc (patch) | |
tree | e639cb06834f05b90d513dd8f67a3a7191082543 /src/nvim/regexp.c | |
parent | e55ebae3734068239c7070dd20ddc34b06c20a7c (diff) | |
parent | 01b2fa53f4593024437f5df25b7744b16b164e4f (diff) | |
download | rneovim-ad6bbe44683cf936ec2268ee89e8e1c22f538ecc.tar.gz rneovim-ad6bbe44683cf936ec2268ee89e8e1c22f538ecc.tar.bz2 rneovim-ad6bbe44683cf936ec2268ee89e8e1c22f538ecc.zip |
Merge #9022 from janlazo/vim-8.0.1215
Diffstat (limited to 'src/nvim/regexp.c')
-rw-r--r-- | src/nvim/regexp.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index 4f51a8b4cf..15a701f022 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -1805,8 +1805,8 @@ static char_u *regatom(int *flagp) if (c == '[') goto collection; - /* "\_x" is character class plus newline */ - /*FALLTHROUGH*/ + // "\_x" is character class plus newline + FALLTHROUGH; /* * Character classes. @@ -2420,7 +2420,7 @@ collection: } else if (reg_strict) EMSG2_RET_NULL(_(e_missingbracket), reg_magic > MAGIC_OFF); } - /* FALLTHROUGH */ + FALLTHROUGH; default: { @@ -5154,8 +5154,8 @@ regrepeat ( case IDENT: case IDENT + ADD_NL: - testval = TRUE; - /*FALLTHROUGH*/ + testval = 1; + FALLTHROUGH; case SIDENT: case SIDENT + ADD_NL: while (count < maxcount) { @@ -5181,8 +5181,8 @@ regrepeat ( case KWORD: case KWORD + ADD_NL: - testval = TRUE; - /*FALLTHROUGH*/ + testval = 1; + FALLTHROUGH; case SKWORD: case SKWORD + ADD_NL: while (count < maxcount) { @@ -5210,8 +5210,8 @@ regrepeat ( case FNAME: case FNAME + ADD_NL: - testval = TRUE; - /*FALLTHROUGH*/ + testval = 1; + FALLTHROUGH; case SFNAME: case SFNAME + ADD_NL: while (count < maxcount) { @@ -5238,8 +5238,8 @@ regrepeat ( case PRINT: case PRINT + ADD_NL: - testval = TRUE; - /*FALLTHROUGH*/ + testval = 1; + FALLTHROUGH; case SPRINT: case SPRINT + ADD_NL: while (count < maxcount) { @@ -5417,8 +5417,8 @@ do_class: case ANYOF: case ANYOF + ADD_NL: - testval = TRUE; - /*FALLTHROUGH*/ + testval = 1; + FALLTHROUGH; case ANYBUT: case ANYBUT + ADD_NL: |