From 57657d85c6c3d812e99b5e5d5161c07c66ac7dc7 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 21 Apr 2006 22:12:41 +0000 Subject: updated for version 7.0e05 --- runtime/indent/automake.vim | 4 ++-- runtime/indent/cmake.vim | 6 +++--- runtime/indent/config.vim | 4 ++-- runtime/indent/css.vim | 4 ++-- runtime/indent/dictconf.vim | 4 ++-- runtime/indent/dictdconf.vim | 4 ++-- runtime/indent/docbk.vim | 4 ++-- runtime/indent/eterm.vim | 4 ++-- runtime/indent/ld.vim | 4 ++-- runtime/indent/make.vim | 47 +++++++++++++++++++++++++------------------- runtime/indent/python.vim | 2 +- runtime/indent/readline.vim | 4 ++-- runtime/indent/rst.vim | 4 ++-- runtime/indent/sh.vim | 4 ++-- runtime/indent/sml.vim | 6 ++++-- runtime/indent/tcl.vim | 4 ++-- runtime/indent/xf86conf.vim | 4 ++-- runtime/indent/xinetd.vim | 4 ++-- runtime/indent/yacc.vim | 4 ++-- runtime/indent/zsh.vim | 4 ++-- 20 files changed, 67 insertions(+), 58 deletions(-) (limited to 'runtime/indent') diff --git a/runtime/indent/automake.vim b/runtime/indent/automake.vim index 0f8dbadf80..28d77a8144 100644 --- a/runtime/indent/automake.vim +++ b/runtime/indent/automake.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: automake -" Maintainer: Nikolai Weibull -" Latest Revision: 2005-06-29 +" Maintainer: Nikolai Weibull +" Latest Revision: 2006-04-19 if exists("b:did_indent") finish diff --git a/runtime/indent/cmake.vim b/runtime/indent/cmake.vim index e36937df5b..a1ad832f24 100644 --- a/runtime/indent/cmake.vim +++ b/runtime/indent/cmake.vim @@ -56,7 +56,7 @@ fun! CMakeGetIndent(lnum) \ or . '[^()\\#"]' . or . '\\.' . '\)*' let cmake_indent_comment_line = '^\s*' . cmake_regex_comment - let cmake_indent_blank_regex = '^\s*$') + let cmake_indent_blank_regex = '^\s*$' let cmake_indent_open_regex = '^\s*' . cmake_regex_identifier . \ '\s*(' . cmake_regex_arguments . \ '\(' . cmake_regex_comment . '\)\?$' @@ -65,8 +65,8 @@ fun! CMakeGetIndent(lnum) \ ')\s*' . \ '\(' . cmake_regex_comment . '\)\?$' - let cmake_indent_begin_regex = '^\s*\(IF\|MACRO\|FOREACH\|ELSE\)\s*(' - let cmake_indent_end_regex = '^\s*\(ENDIF\|ENDFOREACH\|ENDMACRO\|ELSE\)\s*(' + let cmake_indent_begin_regex = '^\s*\(IF\|MACRO\|FOREACH\|ELSE\|WHILE\)\s*(' + let cmake_indent_end_regex = '^\s*\(ENDIF\|ENDFOREACH\|ENDMACRO\|ELSE\|ENDWHILE\)\s*(' " Add if previous_line =~? cmake_indent_comment_line " Handle comments diff --git a/runtime/indent/config.vim b/runtime/indent/config.vim index c6c54b25f7..d763db0dcc 100644 --- a/runtime/indent/config.vim +++ b/runtime/indent/config.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: Autoconf configure.{ac,in} file -" Maintainer: Nikolai Weibull -" Latest Revision: 2006-02-11 +" Maintainer: Nikolai Weibull +" Latest Revision: 2006-04-19 " TODO: how about nested [()]'s in one line " what's wrong with '\\\@!'? diff --git a/runtime/indent/css.vim b/runtime/indent/css.vim index b0560b473d..8c6f114fb6 100644 --- a/runtime/indent/css.vim +++ b/runtime/indent/css.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: CSS -" Maintainer: Nikolai Weibull -" Latest Revision: 2005-06-30 +" Maintainer: Nikolai Weibull +" Latest Revision: 2006-04-19 if exists("b:did_indent") finish diff --git a/runtime/indent/dictconf.vim b/runtime/indent/dictconf.vim index dcaf1e1520..adb096103f 100644 --- a/runtime/indent/dictconf.vim +++ b/runtime/indent/dictconf.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: dict(1) configuration file -" Maintainer: Nikolai Weibull -" Latest Revision: 2005-06-30 +" Maintainer: Nikolai Weibull +" Latest Revision: 2006-04-19 if exists("b:did_indent") finish diff --git a/runtime/indent/dictdconf.vim b/runtime/indent/dictdconf.vim index f8f567064a..235cecd34d 100644 --- a/runtime/indent/dictdconf.vim +++ b/runtime/indent/dictdconf.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: dictd(8) configuration file -" Maintainer: Nikolai Weibull -" Latest Revision: 2005-07-01 +" Maintainer: Nikolai Weibull +" Latest Revision: 2006-04-19 if exists("b:did_indent") finish diff --git a/runtime/indent/docbk.vim b/runtime/indent/docbk.vim index 575b91f006..b8af5f2a10 100644 --- a/runtime/indent/docbk.vim +++ b/runtime/indent/docbk.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: DocBook Documentation Format -" Maintainer: Nikolai Weibull -" Latest Revision: 2005-06-29 +" Maintainer: Nikolai Weibull +" Latest Revision: 2006-04-19 if exists("b:did_indent") finish diff --git a/runtime/indent/eterm.vim b/runtime/indent/eterm.vim index 938b94a72a..730924068b 100644 --- a/runtime/indent/eterm.vim +++ b/runtime/indent/eterm.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: Eterm configuration file -" Maintainer: Nikolai Weibull -" Latest Revision: 2005-06-29 +" Maintainer: Nikolai Weibull +" Latest Revision: 2006-04-19 if exists("b:did_indent") finish diff --git a/runtime/indent/ld.vim b/runtime/indent/ld.vim index 440b106f12..e50b703b20 100644 --- a/runtime/indent/ld.vim +++ b/runtime/indent/ld.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: ld(1) script -" Maintainer: Nikolai Weibull -" Latest Revision: 2005-06-30 +" Maintainer: Nikolai Weibull +" Latest Revision: 2006-04-19 if exists("b:did_indent") finish diff --git a/runtime/indent/make.vim b/runtime/indent/make.vim index 9db77f004a..58504929f2 100644 --- a/runtime/indent/make.vim +++ b/runtime/indent/make.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: Makefile -" Maintainer: Nikolai Weibull -" Latest Revision: 2005-06-29 +" Maintainer: Nikolai Weibull +" Latest Revision: 2006-04-19 if exists("b:did_indent") finish @@ -15,18 +15,9 @@ if exists("*GetMakeIndent") finish endif -function s:GetStringWidth(line, str) - let end = matchend(a:line, a:str) - let width = 0 - for c in a:line - if c == "\t" - let width += &ts - (width % &ts) - else - let width += 1 - endif - endfor - return width -endfunction +let s:rule_rx = '^[^ \t#:][^#:]*:\{1,2}\%([^=:]\|$\)' +let s:continuation_rx = '\\$' +let s:assignment_rx = '^\s*\h\w*\s*+\==\s*\zs.*\\$' function GetMakeIndent() let lnum = v:lnum - 1 @@ -35,11 +26,27 @@ function GetMakeIndent() endif let line = getline(lnum) - if line == '' - return 0 - elseif line =~ '^[^ \t#:][^#:]*:\{1,2}\%([^=:]\|$\)' - return indent(lnum) + &ts - elseif line =~ '^\s*\h\w*\s*+\==\s*.\+\\$' - return s:GetStringWidth(line, '+\==\s*') + let ind = indent(lnum) + + if line =~ s:rule_rx + return ind + &ts + elseif line =~ s:continuation_rx + while lnum > 0 && line =~ s:continuation_rx && line !~ s:assignment_rx + let lnum -= 1 + let line = getline(lnum) + endwhile + if line =~ s:assignment_rx + call cursor(lnum, 1) + return search(s:assignment_rx, 'W') != 0 ? virtcol('.') - 1 : 0 + else + return 0 + endif + else + let pnum = lnum - 1 + if pnum == 0 + return ind + endif + + return getline(pnum) =~ s:continuation_rx ? 0 : ind endif endfunction diff --git a/runtime/indent/python.vim b/runtime/indent/python.vim index f268bf9e50..4b8e81bac7 100644 --- a/runtime/indent/python.vim +++ b/runtime/indent/python.vim @@ -2,7 +2,7 @@ " Language: Python " Maintainer: Bram Moolenaar " Original Author: David Bustos -" Last Change: 2006 Mar 26 +" Last Change: 2006 Apr 21 " Only load this indent file when no other was loaded. if exists("b:did_indent") diff --git a/runtime/indent/readline.vim b/runtime/indent/readline.vim index 52d2a71314..94e4ea4033 100644 --- a/runtime/indent/readline.vim +++ b/runtime/indent/readline.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: readline configuration file -" Maintainer: Nikolai Weibull -" Latest Revision: 2005-06-29 +" Maintainer: Nikolai Weibull +" Latest Revision: 2006-04-19 if exists("b:did_indent") finish diff --git a/runtime/indent/rst.vim b/runtime/indent/rst.vim index f98e7556db..ac5e9bb5c7 100644 --- a/runtime/indent/rst.vim +++ b/runtime/indent/rst.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: reStructuredText Documentation Format -" Maintainer: Nikolai Weibull -" Latest Revision: 2005-06-29 +" Maintainer: Nikolai Weibull +" Latest Revision: 2006-04-19 if exists("b:did_indent") finish diff --git a/runtime/indent/sh.vim b/runtime/indent/sh.vim index b6ce774595..7919c09605 100644 --- a/runtime/indent/sh.vim +++ b/runtime/indent/sh.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: Shell Script -" Maintainer: Nikolai Weibull -" Latest Revision: 2005-06-29 +" Maintainer: Nikolai Weibull +" Latest Revision: 2006-04-19 if exists("b:did_indent") finish diff --git a/runtime/indent/sml.vim b/runtime/indent/sml.vim index 30d3108a60..fbbb15ed85 100644 --- a/runtime/indent/sml.vim +++ b/runtime/indent/sml.vim @@ -130,14 +130,16 @@ function! GetSMLIndent() elseif line =~ '^\s*else\>' if lline !~ '^\s*\(if\|else\|then\)\>' return s:FindPair('\', '', '\') - else return ind + else + return ind endif " Match 'then' with 'if' elseif line =~ '^\s*then\>' if lline !~ '^\s*\(if\|else\|then\)\>' return s:FindPair('\', '', '\') - else return ind + else + return ind endif " Indent if current line begins with ']' diff --git a/runtime/indent/tcl.vim b/runtime/indent/tcl.vim index 546b60daf8..1b0cc16d5b 100644 --- a/runtime/indent/tcl.vim +++ b/runtime/indent/tcl.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: Tcl -" Maintainer: Nikolai Weibull -" Latest Revision: 2005-06-30 +" Maintainer: Nikolai Weibull +" Latest Revision: 2006-04-19 if exists("b:did_indent") finish diff --git a/runtime/indent/xf86conf.vim b/runtime/indent/xf86conf.vim index f1f1c8ed58..5b2be6d3e0 100644 --- a/runtime/indent/xf86conf.vim +++ b/runtime/indent/xf86conf.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: XFree86 Configuration File -" Maintainer: Nikolai Weibull -" Latest Revision: 2005-06-29 +" Maintainer: Nikolai Weibull +" Latest Revision: 2006-04-19 if exists("b:did_indent") finish diff --git a/runtime/indent/xinetd.vim b/runtime/indent/xinetd.vim index 6838163bf8..398e05af98 100644 --- a/runtime/indent/xinetd.vim +++ b/runtime/indent/xinetd.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: xinetd.conf(5) configuration file -" Maintainer: Nikolai Weibull -" Latest Revision: 2005-06-28 +" Maintainer: Nikolai Weibull +" Latest Revision: 2006-04-19 if exists("b:did_indent") finish diff --git a/runtime/indent/yacc.vim b/runtime/indent/yacc.vim index 9d0798d492..d100ceb38b 100644 --- a/runtime/indent/yacc.vim +++ b/runtime/indent/yacc.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: YACC input file -" Maintainer: Nikolai Weibull -" Latest Revision: 2005-06-29 +" Maintainer: Nikolai Weibull +" Latest Revision: 2006-04-19 " Only load this indent file when no other was loaded. if exists("b:did_indent") diff --git a/runtime/indent/zsh.vim b/runtime/indent/zsh.vim index 72b00b8c73..5bf231521b 100644 --- a/runtime/indent/zsh.vim +++ b/runtime/indent/zsh.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: Zsh Shell Script -" Maintainer: Nikolai Weibull -" Latest Revision: 2005-06-29 +" Maintainer: Nikolai Weibull +" Latest Revision: 2006-04-19 if exists("b:did_indent") finish -- cgit v1.2.3