From f6d828a71611401d480b131e618ece4c8b3efd1d Mon Sep 17 00:00:00 2001
From: Robin Jarry <robin.jarry@6wind.com>
Date: Tue, 19 Jun 2018 12:17:42 +0200
Subject: lexers/make: allow more GNU make constructs

* Allow nested macro expansions:
    $(eval $(var))
* Allow digits, dots, slashes and dashes in variable names in expansions:
    $(var-with.1-number)
---
 pygments/lexers/make.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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'),
-- 
cgit v1.2.1


From a6fbcf91b92ae3c9b69c0dc26ddbccc1d9378f8a Mon Sep 17 00:00:00 2001
From: Robin Jarry <robin.jarry@6wind.com>
Date: Tue, 19 Jun 2018 12:25:57 +0200
Subject: lexers/apache: allow '>' characters in tags

Fix lexer to support this:

  <IfVersion >= 2.4>
    ErrorLogFormat "%{cu}t %M"
  </IfVersion>
---
 pygments/lexers/configs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pygments/lexers/configs.py b/pygments/lexers/configs.py
index c39b1a52..9282fcbf 100644
--- a/pygments/lexers/configs.py
+++ b/pygments/lexers/configs.py
@@ -300,7 +300,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'),
-- 
cgit v1.2.1