summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKornelius Kalnbach <murphy@rubychan.de>2013-06-09 07:25:15 +0200
committerKornelius Kalnbach <murphy@rubychan.de>2013-06-09 07:25:15 +0200
commit737fb3608c92506a573a79f611b94ff5d5da18e6 (patch)
tree5825cfc3a91376bf9e7c0b3bf933795c795fae87
parent1ad75645ad880ede3c0590fd6a700b1847cc3fe4 (diff)
downloadcoderay-737fb3608c92506a573a79f611b94ff5d5da18e6.tar.gz
do not warn about plugin fallback
-rw-r--r--Changes.textile1
-rw-r--r--lib/coderay/helpers/plugin.rb1
2 files changed, 1 insertions, 1 deletions
diff --git a/Changes.textile b/Changes.textile
index a3f5ebb..5eee244 100644
--- a/Changes.textile
+++ b/Changes.textile
@@ -7,6 +7,7 @@ h2. Changes in 1.1
* Diff scanner: Highlight inline changes in multi-line changes [#99]
* Remove double-click toggle handler from HTML table output
* Fixes to CSS scanner (floats, pseudoclasses)
+* Plugin does not warn about fallback when default is defined
* Display line numbers in HTML @:table@ mode even for single-line code (remove special case) [#41, thanks to Ariejan de Vroom]
* @CodeRay::TokenKinds@ should not be frozen [#130, thanks to Gavin Kistner]
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]