Merge branch 'fix_heading'

markedjs · Sep 14, 2011 · 2c21b61 · 2c21b61
2 parents 54975d7 + d6ac951
commit 2c21b61
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/marked.js b/lib/marked.js
@@ -13,7 +13,7 @@ var block = {
   newline: /^\n+/,
   block: /^ {4,}[^\n]*(?:\n {4,}[^\n]*|\n)*(?=\n| *$)/,
   hr: /^( *[\-*_]){3,} *\n/,
-  heading: /^ *(#{1,6}) *([^\n#]*) *#*/,
+  heading: /^(#{1,6}) *([^\0]+?) *#*\n+/,
   lheading: /^([^\n]+)\n *(=|-){3,}/,
   blockquote: /^ *>[^\n]*(?:\n *>[^\n]*)*/,
   list: /^( *)([*+-]|\d+\.) [^\0]+?(?:\n{2,}(?! )|\s*$)(?!\1\2|\1\d+\.)/,