diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index 950a871..1bf8f6d 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 7.0aa.  Last change: 2006 Mar 19
+*insert.txt*    For Vim version 7.0aa.  Last change: 2006 Mar 21
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1105,8 +1105,8 @@
 get there right away you can use a mapping that uses CTRL-P right after
 starting the completion: >
 	:imap <F7> <C-N><C-P>
-
-
+<
+						*popupmenu-keys*
 In the first state these keys have a special meaning:
 <BS> and CTRL-H   Delete one character, find the matches for the word before
 		  the cursor.  This reduces the list of matches, often to one
diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt
index e34d30d..4ff7e20 100644
--- a/runtime/doc/undo.txt
+++ b/runtime/doc/undo.txt
@@ -1,4 +1,4 @@
-*undo.txt*      For Vim version 7.0aa.  Last change: 2006 Mar 16
+*undo.txt*      For Vim version 7.0aa.  Last change: 2006 Mar 21
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -108,10 +108,10 @@
 ==============================================================================
 4. Undo branches					*undo-branches*
 
-Above we only discussed one line of undo.  But it is also possible to branch
-off.  This happens when you undo a few changes and then make a new change.
-The undone changes become a branch.  You can go to that branch with the
-following commands.
+Above we only discussed one line of undo/redo.  But it is also possible to
+branch off.  This happens when you undo a few changes and then make a new
+change.  The undone changes become a branch.  You can go to that branch with
+the following commands.
 
 What matters here is the order in which the changes are made.  Undo and redo
 are not considered changes in this context.  After each change you have a new
@@ -179,9 +179,6 @@
 Now undo that by using "g-" three times:
 	one o three ~
 	one wo three ~
-	one two three ~
-
-Continue going back in time by pressing "g-" one more time:
 	 two three ~
 
 You are now back in the first undo branch, after deleting "one".  Repeating
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index c8c7055..1959350 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 7.0aa.  Last change: 2006 Feb 22
+*usr_41.txt*	For Vim version 7.0aa.  Last change: 2006 Mar 21
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -24,6 +24,7 @@
 |41.13|	Writing a compiler plugin
 |41.14|	Writing a plugin that loads quickly
 |41.15|	Writing library scripts
+|41.16|	Distributing Vim scripts
 
      Next chapter: |usr_42.txt|  Add new menus
  Previous chapter: |usr_40.txt|  Make new commands
@@ -2155,6 +2156,9 @@
 script to the second time, which only happens when you actually use it.  When
 you always use the functionality it actually gets slower!
 
+Note that since Vim 7 there is an alternative: use the |autoload|
+functionality |41.15|.
+
 The following example shows how it's done: >
 
 	" Vim global plugin for demonstrating quick loading
@@ -2277,6 +2281,19 @@
 Further reading: |autoload|.
 
 ==============================================================================
+*41.16*	Distributing Vim scripts			*distribute-script*
+
+Vim users will look for scripts on the Vim website: http://www.vim.org.
+If you made something that is useful for others, share it!
+
+Vim scripts can be used on any system.  There might not be a tar or gzip
+command.  If you want to pack files together and/or compress them the "zip"
+utility is recommended.
+
+For utmost portability use Vim itself to pack scripts together.  This can be
+done with the Vimball utility.  See |vimball|.
+
+==============================================================================
 
 Next chapter: |usr_42.txt|  Add new menus
 
diff --git a/src/feature.h b/src/feature.h
index 50979f0..a92fedd 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -392,6 +392,16 @@
 #endif
 
 /*
+ * +reltime		reltime() function
+ */
+#if defined(FEAT_NORMAL) \
+	&& defined(FEAT_EVAL) \
+	&& ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)) \
+		|| defined(WIN3264))
+# define FEAT_RELTIME
+#endif
+
+/*
  * +textobjects		Text objects: "vaw", "das", etc.
  */
 #if defined(FEAT_NORMAL) && defined(FEAT_EVAL)