summaryrefslogtreecommitdiff
path: root/pygments
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2007-12-14 23:33:31 +0100
committerGeorg Brandl <georg@python.org>2007-12-14 23:33:31 +0100
commit4f0feeb892a85fe2ede375de14ff9f7bd7900e6d (patch)
treecced30c634ef9537b4e66bfbba0260a45ddb765c /pygments
parent2084809aac4a8cd77f04fa0864834411a0a51d45 (diff)
downloadpygments-git-4f0feeb892a85fe2ede375de14ff9f7bd7900e6d.tar.gz
Add .properties as an INI file extension.
Diffstat (limited to 'pygments')
-rw-r--r--pygments/lexers/_mapping.py2
-rw-r--r--pygments/lexers/text.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/pygments/lexers/_mapping.py b/pygments/lexers/_mapping.py
index 327f27bd..1db8e3a8 100644
--- a/pygments/lexers/_mapping.py
+++ b/pygments/lexers/_mapping.py
@@ -54,7 +54,7 @@ LEXERS = {
'HtmlLexer': ('pygments.lexers.web', 'HTML', ('html',), ('*.html', '*.htm', '*.xhtml', '*.xslt'), ('text/html', 'application/xhtml+xml')),
'HtmlPhpLexer': ('pygments.lexers.templates', 'HTML+PHP', ('html+php',), ('*.phtml',), ('application/x-php', 'application/x-httpd-php', 'application/x-httpd-php3', 'application/x-httpd-php4', 'application/x-httpd-php5')),
'HtmlSmartyLexer': ('pygments.lexers.templates', 'HTML+Smarty', ('html+smarty',), (), ('text/html+smarty',)),
- 'IniLexer': ('pygments.lexers.text', 'INI', ('ini', 'cfg'), ('*.ini', '*.cfg'), ('text/x-ini',)),
+ 'IniLexer': ('pygments.lexers.text', 'INI', ('ini', 'cfg'), ('*.ini', '*.cfg', '*.properties'), ('text/x-ini',)),
'IoLexer': ('pygments.lexers.agile', 'Io', ('io',), ('*.io',), ('text/x-iosrc',)),
'IrcLogsLexer': ('pygments.lexers.text', 'IRC logs', ('irc',), ('*.weechatlog',), ('text/x-irclog',)),
'JavaLexer': ('pygments.lexers.compiled', 'Java', ('java',), ('*.java',), ('text/x-java',)),
diff --git a/pygments/lexers/text.py b/pygments/lexers/text.py
index c82c0b7c..73e6a28a 100644
--- a/pygments/lexers/text.py
+++ b/pygments/lexers/text.py
@@ -43,7 +43,7 @@ class IniLexer(RegexLexer):
name = 'INI'
aliases = ['ini', 'cfg']
- filenames = ['*.ini', '*.cfg']
+ filenames = ['*.ini', '*.cfg', '*.properties']
mimetypes = ['text/x-ini']
tokens = {