summaryrefslogtreecommitdiff
path: root/src/regexp_nfa.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-09-22 13:57:24 +0200
committerBram Moolenaar <Bram@vim.org>2013-09-22 13:57:24 +0200
commit595cad2ea1c77c40a34a240c71290fdef6aabd3b (patch)
tree841e82bb01f93099172483cc2641caa436732d99 /src/regexp_nfa.c
parent00462ffb7d0fc6448eb5d10681ef4e1f812c7310 (diff)
downloadvim-git-595cad2ea1c77c40a34a240c71290fdef6aabd3b.tar.gz
updated for version 7.4.032v7.4.032
Problem: NFA engine does not match the NUL character. (Jonathon Merz) Solution: Ues 0x0a instead of NUL. (Christian Brabandt)
Diffstat (limited to 'src/regexp_nfa.c')
-rw-r--r--src/regexp_nfa.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index bf4100d1d..cc3a8b64b 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -1383,8 +1383,9 @@ nfa_regatom()
EMSG2_RET_FAIL(
_("E678: Invalid character after %s%%[dxouU]"),
reg_magic == MAGIC_ALL);
+ /* A NUL is stored in the text as NL */
/* TODO: what if a composing character follows? */
- EMIT(nr);
+ EMIT(nr == 0 ? 0x0a : nr);
}
break;