aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFlorian Walch <florian@fwalch.com>2014-12-23 12:21:33 +0100
committerFlorian Walch <florian@fwalch.com>2014-12-23 21:17:01 +0100
commitfc0be5b79dfccc582005367da5ee24bd73592879 (patch)
treefac1e6456a15da2a08a857fdc3c5e2d7fc645af6 /src
parent5b98a4338f47b76ff6aa66d7e5e9df38c65aa3aa (diff)
downloadrneovim-fc0be5b79dfccc582005367da5ee24bd73592879.tar.gz
rneovim-fc0be5b79dfccc582005367da5ee24bd73592879.tar.bz2
rneovim-fc0be5b79dfccc582005367da5ee24bd73592879.zip
vim-patch:7.4.474
Problem: AIX compiler can't handle // comment. Issue 265. Solution: Remove that line. https://code.google.com/p/vim/source/detail?r=v7-4-474
Diffstat (limited to 'src')
-rw-r--r--src/nvim/regexp_nfa.c1
-rw-r--r--src/nvim/version.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c
index 60cdc12c92..2bf73ce72b 100644
--- a/src/nvim/regexp_nfa.c
+++ b/src/nvim/regexp_nfa.c
@@ -3955,7 +3955,6 @@ skip_add:
#endif
switch (state->c) {
case NFA_MATCH:
- //nfa_match = TRUE;
break;
case NFA_SPLIT:
diff --git a/src/nvim/version.c b/src/nvim/version.c
index ea4dfd1ce0..91f160d83f 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -264,7 +264,7 @@ static int included_patches[] = {
477,
//476 NA
//475 NA
- //474,
+ 474,
473,
472,
//471 NA