diff --git a/runtime/indent.vim b/runtime/indent.vim
index 78fb9d0..1557d71 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:	2001 Sep 12
+" Last Change:	2005 Mar 28
 
 if exists("did_indent_on")
   finish
@@ -9,5 +9,17 @@
 let did_indent_on = 1
 
 augroup filetypeindent
-  au FileType * if expand("<amatch>") != "" | if exists("b:did_indent") | unlet b:did_indent | endif | runtime! indent/<amatch>.vim | endif
+  au FileType * call s:LoadIndent()
+  func! s:LoadIndent()
+    if exists("b:undo_indent")
+      exe b:undo_indent
+      unlet! b:undo_indent b:did_indent
+    endif
+    if expand("<amatch>") != ""
+      if exists("b:did_indent")
+	unlet b:did_indent
+      endif
+      runtime! indent/<amatch>.vim
+    endif
+  endfunc
 augroup END