diff options
| author | Marius Kintel <marius@kintel.net> | 2013-06-18 06:16:20 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-06-18 06:16:20 (GMT) |
| commit | a0a49b0bc968179b3a1ff65c12cffceb942f538e (patch) | |
| tree | 67698026477492c47933a51303ab339a2d17158c /src/lexer.l | |
| parent | f452c986e1639455c518daaa9213af2bb4b672cb (diff) | |
| parent | a126fa826c29b88a9edb3452e407de7f2e5a6c03 (diff) | |
Merge remote-tracking branch 'origin/issue181' into epec-kernel
Conflicts:
src/MainWindow.h
src/ModuleCache.cc
src/mainwin.cc
src/module.cc
src/module.h
src/parsersettings.cc
testdata/modulecache-tests/cascade.sh
testdata/modulecache-tests/cascade2.sh
Diffstat (limited to 'src/lexer.l')
| -rw-r--r-- | src/lexer.l | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lexer.l b/src/lexer.l index 0b8048f..3dd3b6b 100644 --- a/src/lexer.l +++ b/src/lexer.l @@ -100,7 +100,7 @@ E [Ee][+-]?{D}+ %% -include[ \t\r\n>]*"<" { BEGIN(cond_include); filepath = filename = "";} +include[ \t\r\n>]*"<" { BEGIN(cond_include); filepath = filename = ""; } <cond_include>{ [^\t\r\n>]*"/" { filepath = yytext; } [^\t\r\n>/]+ { filename = yytext; } |