summaryrefslogtreecommitdiff
path: root/lib/coderay/helpers
diff options
context:
space:
mode:
Diffstat (limited to 'lib/coderay/helpers')
-rw-r--r--lib/coderay/helpers/file_type.rb6
-rw-r--r--lib/coderay/helpers/plugin.rb1
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