From 68d9a901b27eb2b648488f9b147d6d3eedefde04 Mon Sep 17 00:00:00 2001
From: Alexandre Vezina <avezina@ubikvoip.com>
Date: Sat, 23 Mar 2013 13:46:01 -0400
Subject: Support for phtml files

---
 lib/coderay/helpers/file_type.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/coderay/helpers')

diff --git a/lib/coderay/helpers/file_type.rb b/lib/coderay/helpers/file_type.rb
index 637001b..b137448 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'    => :html,
       'php'      => :php,
       'php3'     => :php,
       'php4'     => :php,
-- 
cgit v1.2.1


From 2f285f3d2803ef9742af240a1e5935a2dfc915fc Mon Sep 17 00:00:00 2001
From: Alexandre Vezina <avezina@ubikvoip.com>
Date: Wed, 17 Apr 2013 14:45:16 -0400
Subject: PHP is a better highlight for phtml files

---
 lib/coderay/helpers/file_type.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/coderay/helpers')

diff --git a/lib/coderay/helpers/file_type.rb b/lib/coderay/helpers/file_type.rb
index b137448..f52f17e 100644
--- a/lib/coderay/helpers/file_type.rb
+++ b/lib/coderay/helpers/file_type.rb
@@ -99,7 +99,7 @@ module CodeRay
       'mab'      => :ruby,
       'pas'      => :delphi,
       'patch'    => :diff,
-      'phtml'    => :html,
+      'phtml'    => :php,
       'php'      => :php,
       'php3'     => :php,
       'php4'     => :php,
-- 
cgit v1.2.1


From 737fb3608c92506a573a79f611b94ff5d5da18e6 Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Sun, 9 Jun 2013 07:25:15 +0200
Subject: do not warn about plugin fallback

---
 lib/coderay/helpers/plugin.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lib/coderay/helpers')

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]
-- 
cgit v1.2.1