From: Daniel Hahler <git@thequod.de>
Date: Sat, 17 Nov 2018 18:39:10 +0000 (+0100)
Subject: Merge branch 'master' into searchpair-timeout
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/61e1c4d6a5c90ba0222cd58198ccc0232433f90c?hp=80f44e73fdb2b71d7ef4825b609a682508b2145c

Merge branch 'master' into searchpair-timeout
---

diff --git a/indent/python.vim b/indent/python.vim
index b5ea8a9..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
 
diff --git a/spec/indent/indent_spec.rb b/spec/indent/indent_spec.rb
index 68b545f..9c52235 100644
--- 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