updated for version 7.0092
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 7b37b73..915f3eb 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.0aa.  Last change: 2005 Jun 23
+*options.txt*	For Vim version 7.0aa.  Last change: 2005 Jun 24
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -5673,6 +5673,9 @@
 	region by listing them: "en_us,en_ca" supports both US and Canadian
 	English, but not words specific for Australia, New Zealand or Great
 	Britain.
+	As a special case the name of a .spl file can be given as-is.  This is
+	mainly for testing purposes.  You must make sure the correct encoding
+	is used, Vim doesn't check it.
 	When 'encoding' is set the word lists are reloaded.  Thus it's a good
 	idea to set 'spelllang' after setting 'encoding'.
 	How the related spell files are found is explained here: |spell-load|.
diff --git a/runtime/indent/aap.vim b/runtime/indent/aap.vim
index 78ac033..35828b4 100644
--- a/runtime/indent/aap.vim
+++ b/runtime/indent/aap.vim
@@ -1,7 +1,12 @@
 " Vim indent file
 " Language:	Aap recipe
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2003 Sep 08
+" Last Change:	2005 Jun 24
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
 
 " Works mostly like Python.
 runtime! indent/python.vim