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 branch 'master' into searchpair-timeout
authorDaniel Hahler <git@thequod.de>
Sun, 18 Nov 2018 11:00:33 +0000 (12:00 +0100)
committerDaniel Hahler <git@thequod.de>
Sun, 18 Nov 2018 11:00:33 +0000 (12:00 +0100)
Conflicts:
indent/python.vim

1  2 
indent/python.vim

index b053083091f96ed6d537f2fc89403096ab38f398,4b396099b2acc073d4464a13020679a9b24b32ca..5da97e92fb590cfd8be21b85031348c96a174d9b
@@@ -69,33 -60,23 +69,32 @@@ let s:stop_statement = '^\s*\(break\|co
  let s:skip_after_opening_paren = 'synIDattr(synID(line("."), col("."), 0), "name") ' .
              \ '=~? "\\vcomment|jedi\\S"'
  
 -" Also ignore anything concealed.
 -" Wrapper around synconcealed for older Vim (7.3.429, used on Travis CI).
 -function! s:is_concealed(line, col)
 -    let concealed = synconcealed(a:line, a:col)
 -    return len(concealed) && concealed[0]
 -endfunction
 -if has('conceal')
 -    let s:skip_special_chars .= '|| s:is_concealed(line("."), col("."))'
 -endif
 +if !get(g:, 'python_pep8_indent_skip_concealed', 0) || !has('conceal')
 +    " Skip strings and comments. Return 1 for chars to skip.
 +    " jedi* refers to syntax definitions from jedi-vim for call signatures, which
 +    " are inserted temporarily into the buffer.
 +    function! s:_skip_special_chars(line, col)
 +        return synIDattr(synID(a:line, a:col, 0), 'name')
 +                \ =~? "\\vstring|comment|^pythonbytes%(contents)=$|jedi\\S"
 +    endfunction
 +else
 +    " Also ignore anything concealed.
 +    " TODO: doc; likely only necessary with jedi-vim, where a better version is
 +    " planned (https://github.com/Vimjas/vim-python-pep8-indent/pull/98).
 +
 +    " Wrapper around synconcealed for older Vim (7.3.429, used on Travis CI).
 +    function! s:is_concealed(line, col)
 +        let concealed = synconcealed(a:line, a:col)
 +        return len(concealed) && concealed[0]
 +    endfunction
  
 +    function! s:_skip_special_chars(line, col)
 +        return synIDattr(synID(a:line, a:col, 0), 'name')
 +                \ =~? "\\vstring|comment|^pythonbytes%(contents)=$|jedi\\S"
 +                \ || s:is_concealed(a:line, a:col)
 +    endfunction
 +endif
  
  " Use 'shiftwidth()' instead of '&sw'.
  " (Since Vim patch 7.3.629, 'shiftwidth' can be set to 0 to follow 'tabstop').
  if exists('*shiftwidth')