updated for version 7.1-263

diff --git a/runtime/indent.vim b/runtime/indent.vim
index 1557d7102c68b8f6a06f0ff1c2652b7426677149..12f03648ca946f498a68cf5f399fc7d60ce52b5e 100644 (file)
--- 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 269153ed9e9792a2cb17335ce2c15b5ad92c3ce8..27f12a927a0bfba6fe6bcd212136cbc621f8bdda 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    263,
 /**/
     262,
 /**/