]> git.madduck.net Git - etc/vim.git/blobdiff - after/ftplugin/mkd.vim

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:

Resolve merge conflict
[etc/vim.git] / after / ftplugin / mkd.vim
index f04ae2bec4e8e9b3bb407ac53d948317ade502b0..b0b09467e2fc3b3541a37b9f459636dc1127a7fa 100644 (file)
@@ -7,8 +7,8 @@
 " original version from Steve Losh's gist: https://gist.github.com/1038710
 
 func! Foldexpr_markdown(lnum)
-    if (a:lnum == 0)
-        let l0 = getline(a:lnum)
+    if (a:lnum == 1)
+        let l0 = ''
     else
         let l0 = getline(a:lnum-1)
     endif
@@ -29,9 +29,6 @@ func! Foldexpr_markdown(lnum)
     elseif l0 =~ '^#'
         " current line starts with hashes
         return '>'.matchend(l0, '^#\+')
-    elseif a:lnum == 1
-        " fold any 'preamble'
-        return '>1'
     else
         " keep previous foldlevel
         return '='