aboutsummaryrefslogtreecommitdiff
path: root/runtime/indent/clojure.vim
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-11-07 02:49:08 +0100
committerGitHub <noreply@github.com>2017-11-07 02:49:08 +0100
commitad527392abb60e19954d5e8dba05af282d67d15b (patch)
tree5a8ad20c8cc49b37593e8f1089420446b731b0d0 /runtime/indent/clojure.vim
parentdc9290109481e5e0d0c224fecb217ceb5a4c978d (diff)
parent20e317e22abeef20891eb70a18435559f7b09212 (diff)
downloadrneovim-ad527392abb60e19954d5e8dba05af282d67d15b.tar.gz
rneovim-ad527392abb60e19954d5e8dba05af282d67d15b.tar.bz2
rneovim-ad527392abb60e19954d5e8dba05af282d67d15b.zip
Merge #7499 'vim-patch: runtime'
Diffstat (limited to 'runtime/indent/clojure.vim')
-rw-r--r--runtime/indent/clojure.vim8
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/indent/clojure.vim b/runtime/indent/clojure.vim
index 7592b10d7d..7c4186e29b 100644
--- a/runtime/indent/clojure.vim
+++ b/runtime/indent/clojure.vim
@@ -261,7 +261,7 @@ if exists("*searchpairpos")
call cursor(paren)
if s:is_method_special_case(paren)
- return [paren[0], paren[1] + &shiftwidth - 1]
+ return [paren[0], paren[1] + shiftwidth() - 1]
endif
if s:is_reader_conditional_special_case(paren)
@@ -299,19 +299,19 @@ if exists("*searchpairpos")
let ww = s:strip_namespace_and_macro_chars(w)
if &lispwords =~# '\V\<' . ww . '\>'
- return [paren[0], paren[1] + &shiftwidth - 1]
+ return [paren[0], paren[1] + shiftwidth() - 1]
endif
if g:clojure_fuzzy_indent
\ && !s:match_one(g:clojure_fuzzy_indent_blacklist, ww)
\ && s:match_one(g:clojure_fuzzy_indent_patterns, ww)
- return [paren[0], paren[1] + &shiftwidth - 1]
+ return [paren[0], paren[1] + shiftwidth() - 1]
endif
call search('\v\_s', 'cW')
call search('\v\S', 'W')
if paren[0] < line(".")
- return [paren[0], paren[1] + (g:clojure_align_subforms ? 0 : &shiftwidth - 1)]
+ return [paren[0], paren[1] + (g:clojure_align_subforms ? 0 : shiftwidth() - 1)]
endif
call search('\v\S', 'bW')