aboutsummaryrefslogtreecommitdiff
path: root/runtime/indent/clojure.vim
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2021-11-08 00:10:44 +0100
committerGitHub <noreply@github.com>2021-11-08 00:10:44 +0100
commit8cbe100fcc9c5d34b07f417a82b745803fa3ef19 (patch)
treef859abc6bc58bc21db11d0bf9633b7f31fe48cf6 /runtime/indent/clojure.vim
parent16d4af6d2f549709aa55510f5ae52238c5cadb9c (diff)
downloadrneovim-8cbe100fcc9c5d34b07f417a82b745803fa3ef19.tar.gz
rneovim-8cbe100fcc9c5d34b07f417a82b745803fa3ef19.tar.bz2
rneovim-8cbe100fcc9c5d34b07f417a82b745803fa3ef19.zip
vim-patch:partial 113cb513f76d (#16260)
Update runtime files https://github.com/vim/vim/commit/113cb513f76d8866cbb6dc85fa18aded753e01da skip doc/eval.txt skip doc/insert.txt skip doc/user_06.txt (needs 8.2.3562) partial skip doc/syntax.txt (needs 8.2.3562)
Diffstat (limited to 'runtime/indent/clojure.vim')
-rw-r--r--runtime/indent/clojure.vim19
1 files changed, 8 insertions, 11 deletions
diff --git a/runtime/indent/clojure.vim b/runtime/indent/clojure.vim
index 30a0b478e2..fadcaf4b4a 100644
--- a/runtime/indent/clojure.vim
+++ b/runtime/indent/clojure.vim
@@ -1,11 +1,11 @@
" Vim indent file
" Language: Clojure
-" Maintainer: Alex Vear <av@axvr.io>
+" Maintainer: Alex Vear <alex@vear.uk>
" Former Maintainers: Sung Pae <self@sungpae.com>
" Meikel Brandmeyer <mb@kotka.de>
" URL: https://github.com/clojure-vim/clojure.vim
" License: Vim (see :h license)
-" Last Change: 2021-02-13
+" Last Change: 2021-10-26
if exists("b:did_indent")
finish
@@ -24,7 +24,7 @@ setlocal indentkeys=!,o,O
if exists("*searchpairpos")
if !exists('g:clojure_maxlines')
- let g:clojure_maxlines = 100
+ let g:clojure_maxlines = 300
endif
if !exists('g:clojure_fuzzy_indent')
@@ -71,14 +71,10 @@ if exists("*searchpairpos")
return s:current_char() =~# '\v[\(\)\[\]\{\}]' && !s:ignored_region()
endfunction
- " Returns 1 if string matches a pattern in 'patterns', which may be a
- " list of patterns, or a comma-delimited string of implicitly anchored
- " patterns.
+ " Returns 1 if string matches a pattern in 'patterns', which should be
+ " a list of patterns.
function! s:match_one(patterns, string)
- let list = type(a:patterns) == type([])
- \ ? a:patterns
- \ : map(split(a:patterns, ','), '"^" . v:val . "$"')
- for pat in list
+ for pat in a:patterns
if a:string =~# pat | return 1 | endif
endfor
endfunction
@@ -215,9 +211,10 @@ if exists("*searchpairpos")
endfunction
" Check if form is a reader conditional, that is, it is prefixed by #?
- " or @#?
+ " or #?@
function! s:is_reader_conditional_special_case(position)
return getline(a:position[0])[a:position[1] - 3 : a:position[1] - 2] == "#?"
+ \|| getline(a:position[0])[a:position[1] - 4 : a:position[1] - 2] == "#?@"
endfunction
" Returns 1 for opening brackets, -1 for _anything else_.