From 52342fe6e10ef8890f7b1e6cb106928297322496 Mon Sep 17 00:00:00 2001
From: Christian Hellsten <christian.hellsten@gmail.com>
Date: Wed, 28 Oct 2009 02:12:47 +0200
Subject: [PATCH 1/4] Fixed bug where including includes from an include threw
 an exception.

---
 lib/jekyll.rb              | 2 +-
 test/test_configuration.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 8a27e161..b3ee35e1 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -35,7 +35,7 @@ module Jekyll
     'server'       => false,
     'server_port'  => 4000,
 
-    'source'       => '.',
+    'source'       => Dir.pwd,
     'destination'  => File.join('.', '_site'),
 
     'lsi'          => false,
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index 3b05ed51..3d4554a3 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/helper'
 class TestConfiguration < Test::Unit::TestCase
   context "loading configuration" do
     setup do
-      @path = './_config.yml'
+      @path = File.join(Dir.pwd, '_config.yml')
     end
 
     should "fire warning with no _config.yml" do

From b299a7bad34941b6b07f655fc2335e52dca06c04 Mon Sep 17 00:00:00 2001
From: Christian Hellsten <christian.hellsten@gmail.com>
Date: Sun, 8 Nov 2009 17:38:34 +0200
Subject: [PATCH 2/4] Fixed WEBrick JavaScript mimetype. Fixes Firebug script
 pane

---
 bin/jekyll | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/jekyll b/bin/jekyll
index 3e8469e1..dc4bc3cf 100755
--- a/bin/jekyll
+++ b/bin/jekyll
@@ -136,10 +136,13 @@ if options['server']
   include WEBrick
 
   FileUtils.mkdir_p(destination)
+  mime_types = WEBrick::HTTPUtils::DefaultMimeTypes
+  mime_types.store 'js', 'application/javascript'
 
   s = HTTPServer.new(
     :Port            => options['server_port'],
-    :DocumentRoot    => destination
+    :DocumentRoot    => destination,
+    :MimeTypes       => mime_types
   )
   t = Thread.new {
     s.start

From 8405d307647ff56bfccfc24997daa94eca06d644 Mon Sep 17 00:00:00 2001
From: Christian Hellsten <christian.hellsten@gmail.com>
Date: Sun, 18 Apr 2010 01:51:53 +0300
Subject: [PATCH 3/4] Fixes bug that removes all highlight tags

---
 lib/jekyll/tags/highlight.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb
index eb069c27..c79b963e 100644
--- a/lib/jekyll/tags/highlight.rb
+++ b/lib/jekyll/tags/highlight.rb
@@ -23,10 +23,11 @@ module Jekyll
 
     def render(context)
       if context.registers[:site].pygments
-        render_pygments(context, super.to_s)
+        output = render_pygments(context, super.to_s)
       else
-        render_codehighlighter(context, super.to_s)
+        output = render_codehighlighter(context, super.to_s)
       end
+      output
     end
 
     def render_pygments(context, code)

From 68c69fb3ef37e0bfbdb931e03656897d47c4d11b Mon Sep 17 00:00:00 2001
From: Christian Hellsten <christian.hellsten@gmail.com>
Date: Tue, 22 Jun 2010 15:53:26 +0300
Subject: [PATCH 4/4] removed duplicate .js mime-type

---
 bin/jekyll | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bin/jekyll b/bin/jekyll
index 9c47d48c..b33d4247 100755
--- a/bin/jekyll
+++ b/bin/jekyll
@@ -152,8 +152,6 @@ if options['server']
   include WEBrick
 
   FileUtils.mkdir_p(destination)
-  mime_types = WEBrick::HTTPUtils::DefaultMimeTypes
-  mime_types.store 'js', 'application/javascript'
 
   mime_types = WEBrick::HTTPUtils::DefaultMimeTypes
   mime_types.store 'js', 'application/javascript'