From c983f38cc9f39f34fcb65dd2a71f54a3ea02728a Mon Sep 17 00:00:00 2001
From: Thomas Torsney-Weir <torsneyt@gmail.com>
Date: Tue, 6 Aug 2013 10:52:24 +0200
Subject: [PATCH 1/2] add test to demonstrate issue with markdown extension
 parsing. adding mkd as an extension should not cause mkdn files to also be
 markdownified

---
 test/source/_posts/2013-08-01-mkdn-extension.mkdn | 0
 test/test_generated_site.rb                       | 2 +-
 test/test_post.rb                                 | 7 +++++++
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 test/source/_posts/2013-08-01-mkdn-extension.mkdn

diff --git a/test/source/_posts/2013-08-01-mkdn-extension.mkdn b/test/source/_posts/2013-08-01-mkdn-extension.mkdn
new file mode 100644
index 00000000..e69de29b
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index dd24187f..801675bf 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -14,7 +14,7 @@ class TestGeneratedSite < Test::Unit::TestCase
     end
 
     should "ensure post count is as expected" do
-      assert_equal 35, @site.posts.size
+      assert_equal 36, @site.posts.size
     end
 
     should "insert site.posts into the index" do
diff --git a/test/test_post.rb b/test/test_post.rb
index e38af0fa..57979c65 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -562,6 +562,13 @@ class TestPost < Test::Unit::TestCase
       assert conv.kind_of? Jekyll::Converters::Markdown
     end
 
+    should "process .mkdn under text if it is not in the markdown config" do
+      @site.config['markdown_ext'] = 'markdown,mkd,md,text'
+      post = setup_post '2013-08-01-mkdn-extension.mkdn'
+      conv = post.converter
+      assert conv.kind_of? Jekyll::Converters::Identity
+    end
+
     should "process .text as textile under alternate configuration" do
       @site.config['textile_ext'] = 'textile,text'
       post = setup_post '2011-04-12-text-extension.text'

From 627916bc54d4e62c84667674a68ff7cec439d07c Mon Sep 17 00:00:00 2001
From: Thomas Torsney-Weir <torsneyt@gmail.com>
Date: Tue, 6 Aug 2013 10:56:24 +0200
Subject: [PATCH 2/2] force markdown match to match the full extension

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

diff --git a/lib/jekyll/converters/markdown.rb b/lib/jekyll/converters/markdown.rb
index baeb9bf7..485cac82 100644
--- a/lib/jekyll/converters/markdown.rb
+++ b/lib/jekyll/converters/markdown.rb
@@ -26,7 +26,7 @@ module Jekyll
       end
 
       def matches(ext)
-        rgx = '(' + @config['markdown_ext'].gsub(',','|') +')'
+        rgx = '^\.(' + @config['markdown_ext'].gsub(',','|') +')$'
         ext =~ Regexp.new(rgx, Regexp::IGNORECASE)
       end