]> 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:

projects / etc / vim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a87c86a 3309ad4)
Resolve merge conflict
authorJens Hoepken <jhoepken@gmail.com>
Tue, 19 Mar 2013 12:58:38 +0000 (13:58 +0100)
committerJens Hoepken <jhoepken@gmail.com>
Tue, 19 Mar 2013 12:58:38 +0000 (13:58 +0100)
1  2 
syntax/mkd.vim patch | diff1 | diff2 | blob | history

diff --cc syntax/mkd.vim
index eda1acf7832de9b5c3e4a0d04b4d82fd83afc0a6,ce01867a86006a5d99c5e20a8da21b5ee68b7b70..20b1d3a22e6f17d9eb48f3470c2d36ff86c854f0
--- 1/syntax/mkd.vim
--- 2/syntax/mkd.vim
+++ b/syntax/mkd.vim
@@@ -59,21 -62,21 +62,22 @@@ syn region mkdLinkTitle matchgroup=mkdD
  
  "define Markdown groups
  syn match  mkdLineContinue ".$" contained
- syn match  mkdRule      /^\s*\*\s\{0,1}\*\s\{0,1}\*$/
- syn match  mkdRule      /^\s*-\s\{0,1}-\s\{0,1}-$/
- syn match  mkdRule      /^\s*_\s\{0,1}_\s\{0,1}_$/
- syn match  mkdRule      /^\s*-\{3,}$/
- syn match  mkdRule      /^\s*\*\{3,5}$/
- syn match  mkdListItem  "^\s*[-*+]\s\+"
- syn match  mkdListItem  "^\s*\d\+\.\s\+"
- syn match  mkdCode      /^\s*\n\(\(\s\{4,}[^ ]\|\t\+[^\t]\).*\n\)\+/
- syn match  mkdLineBreak /  \+$/
- syn region mkdFootnote  start="\[^"      end="\]"
- syn region mkdCode      start=/\\\@<!`/                   end=/\\\@<!`/
- syn region mkdCode      start=/\s*``[^`]*/          end=/[^`]*``\s*/
- syn region mkdBlockquote start=/^\s*>/              end=/$/                 contains=mkdLineBreak,mkdLineContinue,@Spell
- syn region mkdCode      start="<pre[^>]*>"         end="</pre>"
- syn region mkdCode      start="<code[^>]*>"        end="</code>"
+ 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*\w*\s*$/          end=/^```\s*$/
+ syn region mkdCode         start="<pre[^>]*>"              end="</pre>"
+ syn region mkdCode         start="<code[^>]*>"             end="</code>"
++syn region mkdFootnote     start="\[^"                     end="\]"
+ syn match  mkdCode         /^\s*\n\(\(\s\{4,}[^ ]\|\t\+[^\t]\).*\n\)\+/
+ syn match  mkdListItem     "^\s*[-*+]\s\+"
+ syn match  mkdListItem     "^\s*\d\+\.\s\+"
+ syn match  mkdRule         /^\s*\*\s\{0,1}\*\s\{0,1}\*$/
+ syn match  mkdRule         /^\s*-\s\{0,1}-\s\{0,1}-$/
+ syn match  mkdRule         /^\s*_\s\{0,1}_\s\{0,1}_$/
+ syn match  mkdRule         /^\s*-\{3,}$/
+ syn match  mkdRule         /^\s*\*\{3,5}$/
  
  "HTML headings
  syn region htmlH1       start="^\s*#"                   end="\($\|#\+\)" contains=@Spell
vim configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.