summaryrefslogtreecommitdiffstats
path: root/runtime/indent/cmake.vim
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-09-27 22:23:55 +0200
committerBram Moolenaar <Bram@vim.org>2017-09-27 22:23:55 +0200
commit24a98a0eb77245adc50facad8b735b20bfd31a7e (patch)
treeffdfef4e7528ec317d59463e5ff83d07e466c0d7 /runtime/indent/cmake.vim
parent9cf39cc57f63f57b4a335cd25371eb456824f049 (diff)
Update runtime files
Diffstat (limited to 'runtime/indent/cmake.vim')
-rw-r--r--runtime/indent/cmake.vim11
1 files changed, 5 insertions, 6 deletions
diff --git a/runtime/indent/cmake.vim b/runtime/indent/cmake.vim
index 85a9ec4e98..845bdd7655 100644
--- a/runtime/indent/cmake.vim
+++ b/runtime/indent/cmake.vim
@@ -3,7 +3,7 @@
" Author: Andy Cedilnik <andy.cedilnik@kitware.com>
" Maintainer: Dimitri Merejkowsky <d.merej@gmail.com>
" Former Maintainer: Karthik Krishnan <karthik.krishnan@kitware.com>
-" Last Change: 2017 Aug 30
+" Last Change: 2017 Sep 24
"
" Licence: The CMake license applies to this file. See
" https://cmake.org/licensing
@@ -14,7 +14,6 @@ if exists("b:did_indent")
endif
let b:did_indent = 1
-setlocal et
setlocal indentexpr=CMakeGetIndent(v:lnum)
setlocal indentkeys+==ENDIF(,ENDFOREACH(,ENDMACRO(,ELSE(,ELSEIF(,ENDWHILE(
@@ -67,19 +66,19 @@ fun! CMakeGetIndent(lnum)
let ind = ind
else
if previous_line =~? cmake_indent_begin_regex
- let ind = ind + &sw
+ let ind = ind + shiftwidth()
endif
if previous_line =~? cmake_indent_open_regex
- let ind = ind + &sw
+ let ind = ind + shiftwidth()
endif
endif
" Subtract
if this_line =~? cmake_indent_end_regex
- let ind = ind - &sw
+ let ind = ind - shiftwidth()
endif
if previous_line =~? cmake_indent_close_regex
- let ind = ind - &sw
+ let ind = ind - shiftwidth()
endif
return ind