diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2012-04-13 15:41:29 +0200 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2012-04-13 15:41:29 +0200 |
| commit | 5598df049e8823f9838b348e76227ef836c4e39b (patch) | |
| tree | ff0ae7c93edde90a65f556d894e2c894bdc15487 /lib/coderay/helpers | |
| parent | 6f3922f4938184d524ba990f0fa3d81531fd9b1e (diff) | |
| parent | 359db4594e7fc874cf8087f599dc4e96b22e586b (diff) | |
| download | coderay-5598df049e8823f9838b348e76227ef836c4e39b.tar.gz | |
Merge branch 'master' into multiline-inline-diff
Diffstat (limited to 'lib/coderay/helpers')
| -rw-r--r-- | lib/coderay/helpers/file_type.rb | 6 | ||||
| -rw-r--r-- | lib/coderay/helpers/plugin.rb | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/coderay/helpers/file_type.rb b/lib/coderay/helpers/file_type.rb index 7b90918..637001b 100644 --- a/lib/coderay/helpers/file_type.rb +++ b/lib/coderay/helpers/file_type.rb @@ -90,8 +90,8 @@ module CodeRay 'gvy' => :groovy, 'h' => :c, 'haml' => :haml, - 'htm' => :page, - 'html' => :page, + 'htm' => :html, + 'html' => :html, 'html.erb' => :erb, 'java' => :java, 'js' => :java_script, @@ -120,7 +120,7 @@ module CodeRay 'sql' => :sql, # 'ss' => :scheme, 'tmproj' => :xml, - 'xhtml' => :page, + 'xhtml' => :html, 'xml' => :xml, 'yaml' => :yaml, 'yml' => :yaml, diff --git a/lib/coderay/helpers/plugin.rb b/lib/coderay/helpers/plugin.rb index 06c1233..137c1ab 100644 --- a/lib/coderay/helpers/plugin.rb +++ b/lib/coderay/helpers/plugin.rb @@ -176,7 +176,6 @@ module CodeRay id = validate_id(plugin_id) path = path_to id begin - raise LoadError, "#{path} not found" unless File.exist? path require path rescue LoadError => boom if @plugin_map_loaded |