summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--runtime/indent.vim12
-rw-r--r--src/version.c2
2 files changed, 11 insertions, 3 deletions
diff --git a/runtime/indent.vim b/runtime/indent.vim
index 1557d7102..12f03648c 100644
--- a/runtime/indent.vim
+++ b/runtime/indent.vim
@@ -1,7 +1,7 @@
" Vim support file to switch on loading indent files for file types
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2005 Mar 28
+" Last Change: 2008 Feb 22
if exists("did_indent_on")
finish
@@ -15,11 +15,17 @@ augroup filetypeindent
exe b:undo_indent
unlet! b:undo_indent b:did_indent
endif
- if expand("<amatch>") != ""
+ let s = expand("<amatch>")
+ if s != ""
if exists("b:did_indent")
unlet b:did_indent
endif
- runtime! indent/<amatch>.vim
+
+ " When there is a dot it is used to separate filetype names. Thus for
+ " "aaa.bbb" load "indent/aaa.vim" and then "indent/bbb.vim".
+ for name in split(s, '\.')
+ exe 'runtime! indent/' . name . '.vim'
+ endfor
endif
endfunc
augroup END
diff --git a/src/version.c b/src/version.c
index 269153ed9..27f12a927 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 263,
+/**/
262,
/**/
261,