diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-10 01:44:16 +0200 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-10 01:44:16 +0200 |
| commit | 4ffc0afac656bef8a897023711cad7f3ca92a5fc (patch) | |
| tree | 6637d5a2f48078d9db6459e73306402c4ee4dddb /lib/coderay/helpers | |
| parent | 02e1bf3c236778197627fe9f9a7b3cf126825a8b (diff) | |
| parent | 2de5dab7d59021622dabf4728e0b8123dc29da8a (diff) | |
| download | coderay-4ffc0afac656bef8a897023711cad7f3ca92a5fc.tar.gz | |
Merge branch 'master' into bash-scanner
Diffstat (limited to 'lib/coderay/helpers')
| -rw-r--r-- | lib/coderay/helpers/file_type.rb | 5 | ||||
| -rw-r--r-- | lib/coderay/helpers/plugin.rb | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/coderay/helpers/file_type.rb b/lib/coderay/helpers/file_type.rb index 637001b..a5d83ff 100644 --- a/lib/coderay/helpers/file_type.rb +++ b/lib/coderay/helpers/file_type.rb @@ -99,6 +99,7 @@ module CodeRay 'mab' => :ruby, 'pas' => :delphi, 'patch' => :diff, + 'phtml' => :php, 'php' => :php, 'php3' => :php, 'php4' => :php, @@ -116,10 +117,10 @@ module CodeRay 'rpdf' => :ruby, 'ru' => :ruby, 'rxml' => :ruby, - # 'sch' => :scheme, + 'sass' => :sass, 'sql' => :sql, - # 'ss' => :scheme, 'tmproj' => :xml, + 'xaml' => :xml, 'xhtml' => :html, 'xml' => :xml, 'yaml' => :yaml, diff --git a/lib/coderay/helpers/plugin.rb b/lib/coderay/helpers/plugin.rb index 137c1ab..dd4e830 100644 --- a/lib/coderay/helpers/plugin.rb +++ b/lib/coderay/helpers/plugin.rb @@ -180,7 +180,6 @@ module CodeRay rescue LoadError => boom if @plugin_map_loaded if h.has_key?(:default) - warn '%p could not load plugin %p; falling back to %p' % [self, id, h[:default]] h[:default] else raise PluginNotFound, '%p could not load plugin %p: %s' % [self, id, boom] |