From 77f26d568138b06af8658659b7566d80bca4792c Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 24 Feb 2014 17:10:43 -0500
Subject: [PATCH 1/2] Upgrade to guard/listen 2.x

---
 jekyll.gemspec               | 2 +-
 lib/jekyll/commands/build.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index cd51ae8c..46509f69 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('liquid', "~> 2.5.5")
   s.add_runtime_dependency('classifier', "~> 1.3")
-  s.add_runtime_dependency('listen', "~> 1.3")
+  s.add_runtime_dependency('listen', "~> 2.5")
   s.add_runtime_dependency('maruku', "0.7.0")
   s.add_runtime_dependency('pygments.rb', "~> 0.5.0")
   s.add_runtime_dependency('mercenary', "~> 0.3.1")
diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb
index 40f0318a..42a4d136 100644
--- a/lib/jekyll/commands/build.rb
+++ b/lib/jekyll/commands/build.rb
@@ -48,7 +48,7 @@ module Jekyll
 
         Jekyll.logger.info "Auto-regeneration:", "enabled"
 
-        listener = Listen::Listener.new(source, :ignore => ignored) do |modified, added, removed|
+        listener = Listen.to(source, :ignore => ignored) do |modified, added, removed|
           t = Time.now.strftime("%Y-%m-%d %H:%M:%S")
           n = modified.length + added.length + removed.length
           print Jekyll.logger.formatted_topic("Regenerating:") + "#{n} files at #{t} "

From d7598ee9d23d47540946795f204cb91e973528c5 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 24 Feb 2014 17:42:46 -0500
Subject: [PATCH 2/2] Ensure inputted code is a string.

---
 lib/jekyll/converters/markdown/redcarpet_parser.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/jekyll/converters/markdown/redcarpet_parser.rb b/lib/jekyll/converters/markdown/redcarpet_parser.rb
index 7a805fe9..cf6c88ca 100644
--- a/lib/jekyll/converters/markdown/redcarpet_parser.rb
+++ b/lib/jekyll/converters/markdown/redcarpet_parser.rb
@@ -5,6 +5,7 @@ module Jekyll
 
         module CommonMethods
           def add_code_tags(code, lang)
+            code = code.to_s
             code = code.sub(/<pre>/, "<pre><code class=\"#{lang} language-#{lang}\" data-lang=\"#{lang}\">")
             code = code.sub(/<\/pre>/,"</code></pre>")
           end