summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES2
-rw-r--r--pygments/lexers/_mapping.py2
-rw-r--r--pygments/lexers/text.py2
3 files changed, 4 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index c0054ea8..f7523665 100644
--- a/CHANGES
+++ b/CHANGES
@@ -27,6 +27,8 @@ Version 0.12
- Fixed numpy lexer that it doesn't listen for "*.py" any longer.
+- Unified Diff lexer supports the "udiff" alias now.
+
Version 0.11.1
--------------
diff --git a/pygments/lexers/_mapping.py b/pygments/lexers/_mapping.py
index 81638345..ba255dae 100644
--- a/pygments/lexers/_mapping.py
+++ b/pygments/lexers/_mapping.py
@@ -46,7 +46,7 @@ LEXERS = {
'DarcsPatchLexer': ('pygments.lexers.text', 'Darcs Patch', ('dpatch',), ('*.dpatch', '*.darcspatch'), ()),
'DebianControlLexer': ('pygments.lexers.text', 'Debian Control file', ('control',), ('control',), ()),
'DelphiLexer': ('pygments.lexers.compiled', 'Delphi', ('delphi', 'pas', 'pascal', 'objectpascal'), ('*.pas',), ('text/x-pascal',)),
- 'DiffLexer': ('pygments.lexers.text', 'Diff', ('diff',), ('*.diff', '*.patch'), ('text/x-diff', 'text/x-patch')),
+ 'DiffLexer': ('pygments.lexers.text', 'Diff', ('diff', 'udiff'), ('*.diff', '*.patch'), ('text/x-diff', 'text/x-patch')),
'DjangoLexer': ('pygments.lexers.templates', 'Django/Jinja', ('django', 'jinja'), (), ('application/x-django-templating', 'application/x-jinja')),
'DylanLexer': ('pygments.lexers.compiled', 'Dylan', ('dylan',), ('*.dylan',), ('text/x-dylan',)),
'ErbLexer': ('pygments.lexers.templates', 'ERB', ('erb',), (), ('application/x-ruby-templating',)),
diff --git a/pygments/lexers/text.py b/pygments/lexers/text.py
index 5b0688e7..b3c11c1f 100644
--- a/pygments/lexers/text.py
+++ b/pygments/lexers/text.py
@@ -208,7 +208,7 @@ class DiffLexer(RegexLexer):
"""
name = 'Diff'
- aliases = ['diff']
+ aliases = ['diff', 'udiff']
filenames = ['*.diff', '*.patch']
mimetypes = ['text/x-diff', 'text/x-patch']