]> 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 #83 from cirosantilli/no-space-before-header
authorCiro Santilli <ciro.santilli@gmail.com>
Mon, 16 Jun 2014 08:40:07 +0000 (10:40 +0200)
committerCiro Santilli <ciro.santilli@gmail.com>
Mon, 16 Jun 2014 08:40:07 +0000 (10:40 +0200)
Don't allow spaces before headers in nav mappings.

Breaks too often when you have code blocks with comments that start with #.

1  2 
ftplugin/mkd.vim

diff --combined ftplugin/mkd.vim
index b18f3be2c14034fc55653d6f24cfa5366e510a5c,33eac2c4563596afc57d2b6bc09020a3d6db43cb..21043a6acafc6de6105fdecb154e0b36600b6151
  
  " For each level, contains the regexp that matches at that level only.
  let s:levelRegexpDict = {
-     \ 1: '\v^(\s*#[^#]|.+\n\=+$)',
-     \ 2: '\v^(\s*##[^#]|.+\n-+$)',
-     \ 3: '\v^\s*###[^#]',
-     \ 4: '\v^\s*####[^#]',
-     \ 5: '\v^\s*#####[^#]',
-     \ 6: '\v^\s*######[^#]'
+     \ 1: '\v^(#[^#]|.+\n\=+$)',
+     \ 2: '\v^(##[^#]|.+\n-+$)',
+     \ 3: '\v^###[^#]',
+     \ 4: '\v^####[^#]',
+     \ 5: '\v^#####[^#]',
+     \ 6: '\v^######[^#]'
  \ }
  
  " Maches any header level of any type.
@@@ -60,7 -60,7 +60,7 @@@
  " This could be deduced from `s:levelRegexpDict`, but it is more
  " efficient to have a single regexp for this.
  "
- let s:headersRegexp = '\v^(\s*#|.+\n(\=+|-+)$)'
+ let s:headersRegexp = '\v^(#|.+\n(\=+|-+)$)'
  
  " Returns the line number of the first header before `line`, called the
  " current header.
@@@ -300,14 -300,7 +300,14 @@@ function! s:Markdown_Toc(...
      else
          let l:window_type = 'vertical'
      endif
 -    silent vimgrep '^#' %
 +
 +    try
 +        silent vimgrep /\(^\S.*\(\n[=-]\+\)\@=\|^#\+\)/ %
 +    catch /E480/
 +        echom "Toc: No headers."
 +        return
 +    endtry
 +
      if l:window_type ==# 'horizontal'
          copen
      elseif l:window_type ==# 'vertical'
      set modifiable
      %s/\v^([^|]*\|){2,2} #//
      for i in range(1, line('$'))
 -        let l:line = getline(i)
 -        let l:header =  matchstr(l:line, '^#*')
 -        let l:length = len(l:header)
 -        let l:line = substitute(l:line, '\v^#*[ ]*', '', '')
 -        let l:line = substitute(l:line, '\v[ ]*#*$', '', '')
 -        let l:line = repeat(' ', (2 * l:length)) . l:line
 -        call setline(i, l:line)
 +        " this is the quickfix data for the current item
 +        let d = getqflist()[i-1]
 +        " atx headers
 +        if match(d.text, "^#") > -1
 +            let l:level = len(matchstr(d.text, '#*', 'g'))-1
 +            let d.text = substitute(d.text, '\v^#*[ ]*', '', '')
 +            let d.text = substitute(d.text, '\v[ ]*#*$', '', '')
 +        " setex headers
 +        else
 +            let l:next_line = getbufline(bufname(d.bufnr), d.lnum+1)
 +            if match(l:next_line, "=") > -1
 +                let l:level = 0
 +            elseif match(l:next_line, "-") > -1
 +                let l:level = 1
 +            endif
 +        endif
 +        call setline(i, repeat('  ', l:level). d.text)
      endfor
      set nomodified
      set nomodifiable