summaryrefslogtreecommitdiffstats
path: root/runtime/indent
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-05-10 19:06:20 +0000
committerBram Moolenaar <Bram@vim.org>2007-05-10 19:06:20 +0000
commit25394022f2fda5c41dc88f5142f15cd3ef4107a4 (patch)
tree63bb42311d52f627c941ad2352b2386c4b5e8687 /runtime/indent
parent3ad16f3fe668ce14f9b2382656f0f63a0d44d05b (diff)
updated for version 7.1b
Diffstat (limited to 'runtime/indent')
-rw-r--r--runtime/indent/config.vim13
-rw-r--r--runtime/indent/xf86conf.vim7
2 files changed, 11 insertions, 9 deletions
diff --git a/runtime/indent/config.vim b/runtime/indent/config.vim
index 77b4ebf1ef..7eb1657572 100644
--- a/runtime/indent/config.vim
+++ b/runtime/indent/config.vim
@@ -1,19 +1,20 @@
" Vim indent file
-" Language: Autoconf configure.{ac,in} file
-" Maintainer: Nikolai Weibull <now@bitwi.se>
-" Latest Revision: 2006-04-19
-" TODO: how about nested [()]'s in one line
-" what's wrong with '\\\@!'?
+" 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
+" what's wrong with '\\\@!'?
" Only load this indent file when no other was loaded.
if exists("b:did_indent")
finish
endif
-runtime! indent/sh.vim " will set b:did_indent
+runtime! indent/sh.vim " will set b:did_indent
setlocal indentexpr=GetConfigIndent()
setlocal indentkeys=!^F,o,O,=then,=do,=else,=elif,=esac,=fi,=fin,=fil,=done
+setlocal nosmartindent
" Only define the function once.
if exists("*GetConfigIndent")
diff --git a/runtime/indent/xf86conf.vim b/runtime/indent/xf86conf.vim
index 04f54c9048..4174a24224 100644
--- a/runtime/indent/xf86conf.vim
+++ b/runtime/indent/xf86conf.vim
@@ -1,7 +1,7 @@
" Vim indent file
-" Language: XFree86 Configuration File
+" Language: XFree86 Configuration File
" Maintainer: Nikolai Weibull <now@bitwi.se>
-" Latest Revision: 2006-04-19
+" Latest Revision: 2006-12-20
if exists("b:did_indent")
finish
@@ -10,6 +10,7 @@ let b:did_indent = 1
setlocal indentexpr=GetXF86ConfIndent()
setlocal indentkeys=!^F,o,O,=End
+setlocal nosmartindent
if exists("*GetXF86ConfIndent")
finish
@@ -28,7 +29,7 @@ function GetXF86ConfIndent()
let ind = ind + &sw
endif
- if getline(v:lnum) =~? '^\s*End\>'
+ if getline(v:lnum) =~? '^\s*End\(Sub\)\=Section\>'
let ind = ind - &sw
endif