summaryrefslogtreecommitdiff
path: root/pygments/lexers/diff.py
diff options
context:
space:
mode:
Diffstat (limited to 'pygments/lexers/diff.py')
-rw-r--r--pygments/lexers/diff.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/pygments/lexers/diff.py b/pygments/lexers/diff.py
index 6a7ba2f3..cbf52558 100644
--- a/pygments/lexers/diff.py
+++ b/pygments/lexers/diff.py
@@ -30,13 +30,16 @@ class DiffLexer(RegexLexer):
tokens = {
'root': [
(r'( )(.*)(\n)', bygroups(Whitespace, Text, Whitespace)),
- (r'(\+.*)(\n)', bygroups(Generic.Inserted, Whitespace)),
- (r'(-.*)(\n)', bygroups(Generic.Deleted, Whitespace)),
- (r'(!.*)(\n)', bygroups(Generic.Strong, Whitespace)),
- (r'(@.*)(\n)', bygroups(Generic.Subheading, Whitespace)),
+ (r'(!.*|---)(\n)', bygroups(Generic.Strong, Whitespace)),
+ (r'((?:< |-).*)(\n)', bygroups(Generic.Deleted, Whitespace)),
+ (r'((?:> |\+).*)(\n)', bygroups(Generic.Inserted, Whitespace)),
+ (
+ r'(@.*|\d(?:,\d+)?(?:a|c|d)\d+(?:,\d+)?)(\n)',
+ bygroups(Generic.Subheading, Whitespace),
+ ),
(r'((?:[Ii]ndex|diff).*)(\n)', bygroups(Generic.Heading, Whitespace)),
(r'(=.*)(\n)', bygroups(Generic.Heading, Whitespace)),
- (r'(.*)(\n)', Whitespace),
+ (r'(.*)(\n)', bygroups(Text, Whitespace)),
]
}