diff options
| author | Anteru <bitbucket@ca.sh13.net> | 2019-04-30 16:05:20 +0000 |
|---|---|---|
| committer | Anteru <bitbucket@ca.sh13.net> | 2019-04-30 16:05:20 +0000 |
| commit | 92c0973a371e669f637710f7c70884f8171df1f4 (patch) | |
| tree | f26d99e2f3c85864f089a75c735541324bd2d11f | |
| parent | 024ce8710ff32c3a2946a0c4542906098d2e7891 (diff) | |
| parent | a6fbcf91b92ae3c9b69c0dc26ddbccc1d9378f8a (diff) | |
| download | pygments-92c0973a371e669f637710f7c70884f8171df1f4.tar.gz | |
Merged in 6wind/pygments-main/lexer-fixes (pull request #766)
Lexer fixes
| -rw-r--r-- | pygments/lexers/configs.py | 2 | ||||
| -rw-r--r-- | pygments/lexers/make.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pygments/lexers/configs.py b/pygments/lexers/configs.py index 6f2c7c76..1984bf36 100644 --- a/pygments/lexers/configs.py +++ b/pygments/lexers/configs.py @@ -301,7 +301,7 @@ class ApacheConfLexer(RegexLexer): 'root': [ (r'\s+', Text), (r'(#.*?)$', Comment), - (r'(<[^\s>]+)(?:(\s+)(.*?))?(>)', + (r'(<[^\s>]+)(?:(\s+)(.*))?(>)', bygroups(Name.Tag, Text, String, Name.Tag)), (r'([a-z]\w*)(\s+)', bygroups(Name.Builtin, Text), 'value'), diff --git a/pygments/lexers/make.py b/pygments/lexers/make.py index b222b672..c1e2f3a9 100644 --- a/pygments/lexers/make.py +++ b/pygments/lexers/make.py @@ -102,8 +102,8 @@ class BaseMakefileLexer(RegexLexer): (r'\$\(', Keyword, 'expansion'), ], 'expansion': [ - (r'[^$a-zA-Z_()]+', Text), - (r'[a-zA-Z_]+', Name.Variable), + (r'[^\w$().-]+', Text), + (r'[\w.-]+', Name.Variable), (r'\$', Keyword), (r'\(', Keyword, '#push'), (r'\)', Keyword, '#pop'), |