Merge branch 'fix_heading'

2011-09-14 12:12:10 -05:00 · 2011-09-14 12:12:10 -05:00 · 2c21b61189
commit 2c21b61189
parent 54975d7bcd d6ac95122b
1 changed files with 1 additions and 1 deletions
--- 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+\.)/,