From 6cd2d5417d728ea96c5c52b34629c944a89eec60 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 11 Feb 2015 11:27:11 -0800
Subject: Update

---
 indent/scala.vim | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'indent/scala.vim')

diff --git a/indent/scala.vim b/indent/scala.vim
index f533a514..4930becd 100644
--- a/indent/scala.vim
+++ b/indent/scala.vim
@@ -9,13 +9,9 @@ if exists("b:did_indent")
 endif
 let b:did_indent = 1
 
+setlocal autoindent
 setlocal indentexpr=GetScalaIndent()
 setlocal indentkeys=0{,0},0),!^F,<>>,o,O,e,=case,<CR>
-setlocal autoindent
-setlocal softtabstop=2
-setlocal tabstop=2
-setlocal shiftwidth=2
-setlocal expandtab
 
 if exists("*GetScalaIndent")
   finish
@@ -543,7 +539,7 @@ function! GetScalaIndent()
     let ind = ind - 1
   endif
 
-  if scala#LineEndsInIncomplete(curline)
+  if scala#LineEndsInIncomplete(prevline)
     call scala#ConditionalConfirm("19")
     return ind
   endif
@@ -597,5 +593,6 @@ function! GetScalaIndent()
 
   return ind
 endfunction
-" vim:set ts=2 sts=2 sw=2:
+
+" vim:set sw=2 sts=2 ts=8 et:
 " vim600:fdm=marker fdl=1 fdc=0:
-- 
cgit v1.2.3