]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Merge pull request #67 from xiaket/master
authorJames Blanding <ilikepi+github@gmail.com>
Fri, 28 Feb 2014 17:16:53 +0000 (12:16 -0500)
committerJames Blanding <ilikepi+github@gmail.com>
Fri, 28 Feb 2014 17:16:53 +0000 (12:16 -0500)
Indented fenced code blocks can now be correctly recognized.

syntax/mkd.vim
test/syntax.md

index 82778c2a93c9049366c5ba250f2d6dac72bd30cc..d6233d24c99e60d29886bee18795a2b966994d6c 100644 (file)
@@ -69,7 +69,7 @@ syn match  mkdLineBreak    /  \+$/
 syn region mkdBlockquote   start=/^\s*>/                   end=/$/ contains=mkdLineBreak,mkdLineContinue,@Spell
 syn region mkdCode         start=/\(\([^\\]\|^\)\\\)\@<!`/ end=/\(\([^\\]\|^\)\\\)\@<!`/
 syn region mkdCode         start=/\s*``[^`]*/              end=/[^`]*``\s*/
-syn region mkdCode         start=/^```\s*[0-9A-Za-z_-]*\s*$/          end=/^```\s*$/
+syn region mkdCode         start=/^\s*```\s*[0-9A-Za-z_-]*\s*$/          end=/^\s*```\s*$/
 syn region mkdCode         start="<pre[^>]*>"              end="</pre>"
 syn region mkdCode         start="<code[^>]*>"             end="</code>"
 syn region mkdFootnote     start="\[^"                     end="\]"
index 8a7421db6207ea02351a306e17f8d0f1036cb12b..9c849e7970c77544113dad08333d3bf2cef05389 100644 (file)
@@ -140,6 +140,16 @@ Fenced code blocks TODO add option to turn ON/OFF:
 fenced code block
 ```
 
+Fenced code living in an indented environment is correctly highlighted:
+
+1. run this command to do this:
+
+    ```
+some command
+    ```
+
+2. Subsequent list items are correctly highlighted.
+
 Fenced code block with language:
 
 ```ruby