diff options
Diffstat (limited to 'pygments/lexers')
-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'), |