Indent empty lines inside blocks (#81)

[etc/vim.git] / indent / python.vim

diff --git a/indent/python.vim b/indent/python.vim
index 8a479f49f265bac94c8c66399cc11481581e2325..b3a514117ca0a544adebc69ff246166bde8f4a68 100644 (file)
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -303,17 +303,19 @@ function! s:indent_like_previous_line(lnum)
         return base + s:sw()
     endif
 
         return base + s:sw()
     endif
 

+    let empty = getline(a:lnum) =~# '^\s*$'
+

     " If the previous statement was a stop-execution statement or a pass
     if getline(start) =~# s:stop_statement
         " Remove one level of indentation if the user hasn't already dedented
     " If the previous statement was a stop-execution statement or a pass
     if getline(start) =~# s:stop_statement
         " Remove one level of indentation if the user hasn't already dedented

-        if indent(a:lnum) > base - s:sw()
+        if empty || current > base - s:sw()

             return base - s:sw()
         endif
         " Otherwise, trust the user
         return -1
     endif
 
             return base - s:sw()
         endif
         " Otherwise, trust the user
         return -1
     endif
 

-    if s:is_dedented_already(current, base)
+    if !empty && s:is_dedented_already(current, base)

         return -1
     endif
 
         return -1
     endif