Fix python-mode#278

klen · klen · commit ea76118ad9fc · 2013-12-01T23:22:42.000+07:00
diff --git a/autoload/pymode/folding.vim b/autoload/pymode/folding.vim
@@ -35,29 +35,29 @@ fun! pymode#folding#expr(lnum) "{{{
 
     let line = getline(a:lnum)
     let indent = indent(a:lnum)
-	let prev_line = getline(a:lnum - 1)
+    let prev_line = getline(a:lnum - 1)
 
     if line =~ s:def_regex || line =~ s:decorator_regex
-		if prev_line =~ s:decorator_regex
-			return '='
-		else
-			return ">".(indent / &shiftwidth + 1)
-		endif
+        if prev_line =~ s:decorator_regex
+            return '='
+        else
+            return ">".(indent / &shiftwidth + 1)
+        endif
     endif
 
-    if line =~ s:doc_begin_regex
-				\ && line !~ s:doc_line_regex
-				\ && prev_line =~ s:def_regex
-		return ">".(indent / &shiftwidth + 1)
+    if line =~ s:doc_begin_regex && line !~ s:doc_line_regex && prev_line =~ s:def_regex
+        return ">".(indent / &shiftwidth + 1)
     endif
 
-    if line =~ s:doc_end_regex
-				\ && line !~ s:doc_line_regex
-		return "<".(indent / &shiftwidth + 1)
+    if line =~ s:doc_end_regex && line !~ s:doc_line_regex
+        return "<".(indent / &shiftwidth + 1)
     endif
 
     if line =~ s:blank_regex
         if prev_line =~ s:blank_regex
+            if indent(a:lnum + 1) == 0 && getline(a:lnum + 1) !~ s:blank_regex
+                return 0
+            endif
             return -1
         else
             return '='
