diff options
Diffstat (limited to 'runtime/indent')
-rw-r--r-- | runtime/indent/automake.vim | 6 | ||||
-rw-r--r-- | runtime/indent/config.vim | 8 | ||||
-rw-r--r-- | runtime/indent/css.vim | 5 | ||||
-rw-r--r-- | runtime/indent/dictconf.vim | 6 | ||||
-rw-r--r-- | runtime/indent/dictdconf.vim | 6 | ||||
-rw-r--r-- | runtime/indent/docbk.vim | 6 | ||||
-rw-r--r-- | runtime/indent/dtd.vim | 6 | ||||
-rw-r--r-- | runtime/indent/eterm.vim | 6 | ||||
-rw-r--r-- | runtime/indent/framescript.vim | 6 | ||||
-rw-r--r-- | runtime/indent/ld.vim | 6 | ||||
-rw-r--r-- | runtime/indent/make.vim | 6 | ||||
-rw-r--r-- | runtime/indent/readline.vim | 6 | ||||
-rw-r--r-- | runtime/indent/rst.vim | 6 | ||||
-rw-r--r-- | runtime/indent/tf.vim | 14 | ||||
-rw-r--r-- | runtime/indent/treetop.vim | 6 | ||||
-rw-r--r-- | runtime/indent/verilog.vim | 10 | ||||
-rw-r--r-- | runtime/indent/xf86conf.vim | 6 | ||||
-rw-r--r-- | runtime/indent/xinetd.vim | 6 | ||||
-rw-r--r-- | runtime/indent/yacc.vim | 6 |
19 files changed, 65 insertions, 62 deletions
diff --git a/runtime/indent/automake.vim b/runtime/indent/automake.vim index 5fbc222bc..7e38f92eb 100644 --- a/runtime/indent/automake.vim +++ b/runtime/indent/automake.vim @@ -1,7 +1,7 @@ " Vim indent file -" Language: automake -" Maintainer: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2006-04-19 +" Language: automake +" Previous Maintainer: Nikolai Weibull <now@bitwi.se> +" Latest Revision: 2006-04-19 if exists("b:did_indent") finish diff --git a/runtime/indent/config.vim b/runtime/indent/config.vim index 7eb165757..074f467be 100644 --- a/runtime/indent/config.vim +++ b/runtime/indent/config.vim @@ -1,8 +1,8 @@ " Vim indent file -" Language: Autoconf configure.{ac,in} file -" Maintainer: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2006-12-20 -" TODO: how about nested [()]'s in one line +" Language: Autoconf configure.{ac,in} file +" Previous Maintainer: Nikolai Weibull <now@bitwi.se> +" Latest Revision: 2006-12-20 +" TODO: how about nested [()]'s in one line " what's wrong with '\\\@!'? " Only load this indent file when no other was loaded. diff --git a/runtime/indent/css.vim b/runtime/indent/css.vim index f0a272eff..4d15b8d2d 100644 --- a/runtime/indent/css.vim +++ b/runtime/indent/css.vim @@ -2,6 +2,7 @@ " Language: CSS " Maintainer: Nikolai Weibull <now@bitwi.se> " Latest Revision: 2012-05-30 +" Use of shiftwidth() added by Oleg Zubchenko. if exists("b:did_indent") finish @@ -75,8 +76,8 @@ function GetCSSIndent() return 0 endif - return indent(pnum) + s:count_braces(pnum, 1) * &sw - \ - s:count_braces(v:lnum, 0) * &sw + return indent(pnum) + s:count_braces(pnum, 1) * shiftwidth() + \ - s:count_braces(v:lnum, 0) * shiftwidth() endfunction let &cpo = s:keepcpo diff --git a/runtime/indent/dictconf.vim b/runtime/indent/dictconf.vim index adbc1a524..2e15c7614 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 <now@bitwi.se> -" Latest Revision: 2006-12-20 +" Language: dict(1) configuration file +" Previous Maintainer: Nikolai Weibull <now@bitwi.se> +" Latest Revision: 2006-12-20 if exists("b:did_indent") finish diff --git a/runtime/indent/dictdconf.vim b/runtime/indent/dictdconf.vim index 9427342c7..5c4fbdafb 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 <now@bitwi.se> -" Latest Revision: 2006-12-20 +" Language: dictd(8) configuration file +" Previous Maintainer: Nikolai Weibull <now@bitwi.se> +" Latest Revision: 2006-12-20 if exists("b:did_indent") finish diff --git a/runtime/indent/docbk.vim b/runtime/indent/docbk.vim index 3fde2a13b..d8661ffbe 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 <now@bitwi.se> -" Latest Revision: 2006-04-19 +" Language: DocBook Documentation Format +" Previous Maintainer: Nikolai Weibull <now@bitwi.se> +" Latest Revision: 2006-04-19 if exists("b:did_indent") finish diff --git a/runtime/indent/dtd.vim b/runtime/indent/dtd.vim index 88c0c5129..779cee9e6 100644 --- a/runtime/indent/dtd.vim +++ b/runtime/indent/dtd.vim @@ -1,7 +1,7 @@ " Vim indent file -" Language: DTD (Document Type Definition for XML) -" Maintainer: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2011-07-08 +" Language: DTD (Document Type Definition for XML) +" Previous Maintainer: Nikolai Weibull <now@bitwi.se> +" Latest Revision: 2011-07-08 let s:cpo_save = &cpo set cpo&vim diff --git a/runtime/indent/eterm.vim b/runtime/indent/eterm.vim index f25f5f4da..e5fea1d3b 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 <now@bitwi.se> -" Latest Revision: 2006-12-20 +" Language: Eterm configuration file +" Previous Maintainer: Nikolai Weibull <now@bitwi.se> +" Latest Revision: 2006-12-20 if exists("b:did_indent") finish diff --git a/runtime/indent/framescript.vim b/runtime/indent/framescript.vim index 49ff92a81..e35d00eb0 100644 --- a/runtime/indent/framescript.vim +++ b/runtime/indent/framescript.vim @@ -1,7 +1,7 @@ " Vim indent file -" Language: FrameScript -" Maintainer: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2008-07-19 +" Language: FrameScript +" Previous Maintainer: Nikolai Weibull <now@bitwi.se> +" Latest Revision: 2008-07-19 if exists("b:did_indent") finish diff --git a/runtime/indent/ld.vim b/runtime/indent/ld.vim index eccf42b2b..6544c4d51 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 <now@bitwi.se> -" Latest Revision: 2006-12-20 +" Language: ld(1) script +" Previous Maintainer: Nikolai Weibull <now@bitwi.se> +" Latest Revision: 2006-12-20 if exists("b:did_indent") finish diff --git a/runtime/indent/make.vim b/runtime/indent/make.vim index 8412fbb4d..2a4b4580a 100644 --- a/runtime/indent/make.vim +++ b/runtime/indent/make.vim @@ -1,7 +1,7 @@ " Vim indent file -" Language: Makefile -" Maintainer: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2007-05-07 +" Language: Makefile +" Previous Maintainer: Nikolai Weibull <now@bitwi.se> +" Latest Revision: 2007-05-07 if exists("b:did_indent") finish diff --git a/runtime/indent/readline.vim b/runtime/indent/readline.vim index 6ac2185bd..a58cc411b 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 <now@bitwi.se> -" Latest Revision: 2006-12-20 +" Language: readline configuration file +" Previous Maintainer: Nikolai Weibull <now@bitwi.se> +" Latest Revision: 2006-12-20 if exists("b:did_indent") finish diff --git a/runtime/indent/rst.vim b/runtime/indent/rst.vim index 80d3308fd..c1ef8c995 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 <now@bitwi.se> -" Latest Revision: 2011-08-03 +" Language: reStructuredText Documentation Format +" Previous Maintainer: Nikolai Weibull <now@bitwi.se> +" Latest Revision: 2011-08-03 if exists("b:did_indent") finish diff --git a/runtime/indent/tf.vim b/runtime/indent/tf.vim index 17597734b..a98053850 100644 --- a/runtime/indent/tf.vim +++ b/runtime/indent/tf.vim @@ -1,8 +1,8 @@ " Vim indent file " Language: tf (TinyFugue) " Maintainer: Christian J. Robinson <heptite@gmail.com> -" URL: http://christianrobinson.name/vim/indent/tf.vim -" Last Change: 2002 May 29 +" URL: http://www.vim.org/scripts/script.php?script_id=174 +" Last Change: 2017 Feb 25 " Only load this indent file when no other was loaded. if exists("b:did_indent") @@ -38,14 +38,14 @@ function GetTFIndent() endif if line =~ '\(/def.*\\\|/for.*\(%;\s*\)\@\<!\\\)$' - let ind = ind + &sw + let ind = ind + shiftwidth() elseif line =~ '\(/if\|/else\|/then\)' if line !~ '/endif' - let ind = ind + &sw + let ind = ind + shiftwidth() endif elseif line =~ '/while' if line !~ '/done' - let ind = ind + &sw + let ind = ind + shiftwidth() endif endif @@ -53,11 +53,11 @@ function GetTFIndent() if line =~ '\(/else\|/endif\|/then\)' if line !~ '/if' - let ind = ind - &sw + let ind = ind - shiftwidth() endif elseif line =~ '/done' if line !~ '/while' - let ind = ind - &sw + let ind = ind - shiftwidth() endif endif diff --git a/runtime/indent/treetop.vim b/runtime/indent/treetop.vim index a2af78b8c..01716e719 100644 --- a/runtime/indent/treetop.vim +++ b/runtime/indent/treetop.vim @@ -1,7 +1,7 @@ " Vim indent file -" Language: Treetop -" Maintainer: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2011-03-14 +" Language: Treetop +" Previous Maintainer: Nikolai Weibull <now@bitwi.se> +" Latest Revision: 2011-03-14 if exists("b:did_indent") finish diff --git a/runtime/indent/verilog.vim b/runtime/indent/verilog.vim index ecca46263..6222dc341 100644 --- a/runtime/indent/verilog.vim +++ b/runtime/indent/verilog.vim @@ -1,10 +1,12 @@ " Language: Verilog HDL -" Maintainer: Chih-Tsun Huang <cthuang@larc.ee.nthu.edu.tw> -" Last Change: 2011 Dec 10 by Thilo Six -" URL: http://larc.ee.nthu.edu.tw/~cthuang/vim/indent/verilog.vim +" Maintainer: Chih-Tsun Huang <cthuang@cs.nthu.edu.tw> +" Last Change: 2017 Feb 24 by Chih-Tsun Huang +" URL: http://www.cs.nthu.edu.tw/~cthuang/vim/indent/verilog.vim " " Credits: " Suggestions for improvement, bug reports by +" Takuya Fujiwara <tyru.exe@gmail.com> +" Thilo Six <debian@Xk2c.de> " Leo Butlero <lbutler@brocade.com> " " Buffer Variables: @@ -38,7 +40,7 @@ function GetVerilogIndent() if exists('b:verilog_indent_width') let offset = b:verilog_indent_width else - let offset = &sw + let offset = shiftwidth() endif if exists('b:verilog_indent_modules') let indent_modules = offset diff --git a/runtime/indent/xf86conf.vim b/runtime/indent/xf86conf.vim index 4174a2422..7c3ea15d9 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 <now@bitwi.se> -" Latest Revision: 2006-12-20 +" Language: XFree86 Configuration File +" Previous Maintainer: Nikolai Weibull <now@bitwi.se> +" Latest Revision: 2006-12-20 if exists("b:did_indent") finish diff --git a/runtime/indent/xinetd.vim b/runtime/indent/xinetd.vim index c8127237e..5a32a74d1 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 <now@bitwi.se> -" Latest Revision: 2006-12-20 +" Language: xinetd.conf(5) configuration file +" Previous Maintainer: Nikolai Weibull <now@bitwi.se> +" Latest Revision: 2006-12-20 if exists("b:did_indent") finish diff --git a/runtime/indent/yacc.vim b/runtime/indent/yacc.vim index 2ab7d7b38..01ad4fc56 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 <now@bitwi.se> -" Latest Revision: 2006-12-20 +" Language: YACC input file +" Previous Maintainer: Nikolai Weibull <now@bitwi.se> +" Latest Revision: 2006-12-20 " Only load this indent file when no other was loaded. if exists("b:did_indent") |