summaryrefslogtreecommitdiff
path: root/pygments/lexers/dotnet.py
diff options
context:
space:
mode:
authorTim Hatch <tim@timhatch.com>2012-02-27 18:55:15 -0800
committerTim Hatch <tim@timhatch.com>2012-02-27 18:55:15 -0800
commit9d519e510f887c337c7a715d80e07b15357d33dc (patch)
tree5d847cc5a55354f5494d67c1e5034891f3b244c2 /pygments/lexers/dotnet.py
parent5558d3ba11cc7b2d1e16228ce3c5402b7d48072c (diff)
parente6abbe90c96cb77c0a775c8ae4427eb2f49c1f98 (diff)
downloadpygments-9d519e510f887c337c7a715d80e07b15357d33dc.tar.gz
Merge pygments-main with pygments-tim
Diffstat (limited to 'pygments/lexers/dotnet.py')
-rw-r--r--pygments/lexers/dotnet.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pygments/lexers/dotnet.py b/pygments/lexers/dotnet.py
index 8b7a0b89..7596558f 100644
--- a/pygments/lexers/dotnet.py
+++ b/pygments/lexers/dotnet.py
@@ -344,7 +344,7 @@ class BooLexer(RegexLexer):
(r"'(\\\\|\\'|[^']*?)'", String.Single),
(r'[a-zA-Z_][a-zA-Z0-9_]*', Name),
(r'(\d+\.\d*|\d*\.\d+)([fF][+-]?[0-9]+)?', Number.Float),
- (r'[0-9][0-9\.]*(m|ms|d|h|s)', Number),
+ (r'[0-9][0-9\.]*(ms?|d|h|s)', Number),
(r'0\d+', Number.Oct),
(r'0x[a-fA-F0-9]+', Number.Hex),
(r'\d+L', Number.Integer.Long),