aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/regexp.c
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-10-17 10:21:40 -0400
committerGitHub <noreply@github.com>2021-10-17 10:21:40 -0400
commit77e6ecf85aa756ebca4548e4cfbc906bf8fff568 (patch)
treecbbaf43aeb2f221b9c0431c94e73ef38e9c88a9f /src/nvim/regexp.c
parentd2d30dfabdaacfd53b081354248402c797576482 (diff)
parentb98383a2501007b979e491a13fcb1387f1d9101a (diff)
downloadrneovim-77e6ecf85aa756ebca4548e4cfbc906bf8fff568.tar.gz
rneovim-77e6ecf85aa756ebca4548e4cfbc906bf8fff568.tar.bz2
rneovim-77e6ecf85aa756ebca4548e4cfbc906bf8fff568.zip
Merge pull request #15930 from dundargoc/vim-patch/old-style-c-comments
vim-patch:8.1.2396,8.1.2395,8.1.2394,8.1.2392,8.1.2368,8.1.2388,8.1.2379
Diffstat (limited to 'src/nvim/regexp.c')
-rw-r--r--src/nvim/regexp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index ea4f2ecaf1..24dc86e034 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -3005,8 +3005,8 @@ static void ungetchr(void)
at_start = prev_at_start;
prev_at_start = false;
- /* Backup regparse, so that it's at the same position as before the
- * getchr(). */
+ // Backup regparse, so that it's at the same position as before the
+ // getchr().
regparse -= prevchr_len;
}
@@ -6414,8 +6414,8 @@ static int cstrncmp(char_u *s1, char_u *s2, int *n)
int c1, c2, c11, c12;
int junk;
- /* we have to handle the strcmp ourselves, since it is necessary to
- * deal with the composing characters by ignoring them: */
+ // we have to handle the strcmp ourselves, since it is necessary to
+ // deal with the composing characters by ignoring them:
str1 = s1;
str2 = s2;
c1 = c2 = 0;
@@ -7186,8 +7186,8 @@ static regengine_T nfa_regengine =
(char_u *)""
};
-/* Which regexp engine to use? Needed for vim_regcomp().
- * Must match with 'regexpengine'. */
+// Which regexp engine to use? Needed for vim_regcomp().
+// Must match with 'regexpengine'.
static int regexp_engine = 0;
#ifdef REGEXP_DEBUG