diff --git a/runtime/ftplugin.vim b/runtime/ftplugin.vim
index d081326..9226566 100644
--- a/runtime/ftplugin.vim
+++ b/runtime/ftplugin.vim
@@ -1,7 +1,7 @@
 " Vim support file to switch on loading plugins for file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2004 Nov 22
+" Last change:	2005 Mar 25
 
 if exists("did_load_ftplugin")
   finish
@@ -11,11 +11,11 @@
 augroup filetypeplugin
   au FileType * call s:LoadFTPlugin()
   func! s:LoadFTPlugin()
+    if exists("b:undo_ftplugin")
+      exe b:undo_ftplugin
+      unlet! b:undo_ftplugin b:did_ftplugin
+    endif
     if expand("<amatch>") != ""
-      if exists("b:undo_ftplugin")
-	exe b:undo_ftplugin
-	unlet! b:undo_ftplugin b:did_ftplugin
-      endif
       if &cpo =~# "S" && exists("b:did_ftplugin")
 	" In compatible mode options are reset to the global values, need to
 	" set the local values also when a plugin was already used.