X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/6ef7bc19a5e7e29b256b2f3c009e73e405945239..61e1c4d6a5c90ba0222cd58198ccc0232433f90c:/indent/python.vim

diff --git a/indent/python.vim b/indent/python.vim
index cc9d6c2..977ec05 100644
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -330,7 +330,7 @@ function! s:indent_like_previous_line(lnum)
         return -1
     endif
 
-    if !empty && s:is_dedented_already(current, base)
+    if (current || !empty) && s:is_dedented_already(current, base)
         return -1
     endif
 
@@ -381,11 +381,12 @@ function! GetPythonPEPIndent(lnum)
         if match_quotes != -1
             " closing multiline string
             let quotes = line[match_quotes:(match_quotes+2)]
-            let pairpos = searchpairpos(quotes, '', quotes, 'b', 1, g:python_pep8_indent_searchpair_timeout)
+            call cursor(a:lnum, 1)
+            let pairpos = searchpairpos(quotes, '', quotes, 'bW', '', 0, g:python_pep8_indent_searchpair_timeout)
             if pairpos[0] != 0
                 return indent(pairpos[0])
             else
-                " TODO: test to cover this!
+                return -1
             endif
         endif