Merge branch 'master' into searchpair-timeout

diff --git a/indent/python.vim b/indent/python.vim
index b5ea8a994eb3661953473b1a7203e2e86e51a77b..977ec05f0a55a9719af64feff18baf5d9a1cf452 100644 (file)
--- 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
 

diff --git a/spec/indent/indent_spec.rb b/spec/indent/indent_spec.rb
index 68b545f68b22799d0f16514ed63f72eaba1e4a06..9c52235d37204b99ea3b72d3110370b23a9e32ba 100644 (file)
--- a/spec/indent/indent_spec.rb
+++ b/spec/indent/indent_spec.rb
@@ -700,3 +700,22 @@ describe "Compact multiline dict" do
     proposed_indent.should == 0
   end
 end
+
+describe "Using O" do
+  before { vim.feedkeys 'iif foo:\<CR>' }
+
+  it "respects autoindent" do
+    vim.feedkeys '1\<CR>\<CR>'
+    indent.should == shiftwidth
+    vim.feedkeys '\<Esc>ko'
+    indent.should == shiftwidth
+    vim.feedkeys '\<Esc>kO'
+    indent.should == shiftwidth
+    # Uses/keeps indent from line above
+    vim.feedkeys '\<Esc>i2\<Esc>O'
+    indent.should == shiftwidth
+    # Uses/keeps indent from line above
+    vim.feedkeys '\<Esc>j\<Esc>O'
+    indent.should == 0
+  end
+end