summaryrefslogtreecommitdiffstats
path: root/indent
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--indent/clojure.vim6
-rw-r--r--indent/less.vim39
-rw-r--r--indent/perl.vim2
3 files changed, 11 insertions, 36 deletions
diff --git a/indent/clojure.vim b/indent/clojure.vim
index 41201252..fd9ebb69 100644
--- a/indent/clojure.vim
+++ b/indent/clojure.vim
@@ -53,6 +53,10 @@ if exists("*searchpairpos")
let g:clojure_align_multiline_strings = 0
endif
+ if !exists('g:clojure_align_subforms')
+ let g:clojure_align_subforms = 0
+ endif
+
function! s:SynIdName()
return synIDattr(synID(line("."), col("."), 0), "name")
endfunction
@@ -284,7 +288,7 @@ if exists("*searchpairpos")
call search('\v\_s', 'cW')
call search('\v\S', 'W')
if paren[0] < line(".")
- return paren[1] + &shiftwidth - 1
+ return paren[1] + (g:clojure_align_subforms ? 0 : &shiftwidth - 1)
endif
call search('\v\S', 'bW')
diff --git a/indent/less.vim b/indent/less.vim
index 6161c93c..556c2d08 100644
--- a/indent/less.vim
+++ b/indent/less.vim
@@ -1,41 +1,10 @@
" Vim indent file
-" Language: LessCSS
-" Maintainer: Leonard Ehrenfried <leonard.ehrenfried@web.de>
-" Last Change: 2011 Sep 26
+" Language: LessCSS
+" Maintainer: Leonard Ehrenfried <leonard.ehrenfried@web.de>
+" Last Change: 2011 Sep 26
if exists("b:did_indent")
finish
endif
-let b:did_indent = 1
-
-setlocal autoindent sw=2 et
-setlocal indentexpr=GetLessIndent()
-setlocal indentkeys=o,O,*<Return>,<:>,!^F
-
-" Only define the function once.
-if exists("*GetLessIndent")
- finish
-endif
-
-let s:property = '^\s*:\|^\s*[[:alnum:]#{}-]\+\%(:\|\s*=\)'
-
-function! GetLessIndent()
- let lnum = prevnonblank(v:lnum-1)
- let line = substitute(getline(lnum),'\s\+$','','')
- let cline = substitute(substitute(getline(v:lnum),'\s\+$','',''),'^\s\+','','')
- let lastcol = strlen(line)
- let line = substitute(line,'^\s\+','','')
- let indent = indent(lnum)
- let cindent = indent(v:lnum)
- if line !~ s:property && cline =~ s:property
- return indent + &sw
- "elseif line =~ s:property && cline !~ s:property
- "return indent - &sw
- else
- return -1
- endif
-endfunction
-
-" vim:set sw=2:
-
+runtime! indent/css.vim \ No newline at end of file
diff --git a/indent/perl.vim b/indent/perl.vim
index a8e92fd5..3ce3e59a 100644
--- a/indent/perl.vim
+++ b/indent/perl.vim
@@ -134,6 +134,7 @@ function! GetPerlIndent()
\ || synid == "perlMatchStartEnd"
\ || synid == "perlHereDoc"
\ || synid == "perlBraces"
+ \ || synid == "perlStatementIndirObj"
\ || synid =~ "^perlFiledescStatement"
\ || synid =~ '^perl\(Sub\|Block\|Package\)Fold'
let brace = strpart(line, bracepos, 1)
@@ -151,6 +152,7 @@ function! GetPerlIndent()
if synid == ""
\ || synid == "perlMatchStartEnd"
\ || synid == "perlBraces"
+ \ || synid == "perlStatementIndirObj"
\ || synid =~ '^perl\(Sub\|Block\|Package\)Fold'
let ind = ind - &sw
endif