updated for version 7.0231

diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index 950a871492b688ba485059209313b35f2eb3d066..1bf8f6dc352fd0429762ab9f8e14fb2a11d18677 100644 (file)
--- 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 @@ When you are back at the original text then you are in the second state.  To
 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 e34d30d59be534d5076d18941e34db26bff65a2e..4ff7e20ce5d05b4d0c05658ac1ce38293d5ca815 100644 (file)
--- 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 @@ change.
 ==============================================================================
 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 @@ Delete the second word by pressing "x" three times:
 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 c8c70559b61a356735582248ed2e98afe4fe7f17..1959350387bf15acabfc696ba7d881e050813a66 100644 (file)
--- 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 @@ script.  There are a lot of them, thus this is a long chapter.
 |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 @@ mean is that it loads quickly the first time, postponing the bulk of the
 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
@@ -2276,6 +2280,19 @@ like: >
 
 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 50979f04c8ef6365530ae994d664de29e866bf9c..a92fedd9628b19cd99f9f19f7b05b2f04bbf55b3 100644 (file)
--- a/src/feature.h
+++ b/src/feature.h
@@ -391,6 +391,16 @@
 # define FEAT_PROFILE
 #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.
  */