updated for version 7.0226

4 files changed, 37 insertions, 3 deletions

diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index e4c5674fa3..408632291f 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 7.0aa.  Last change: 2006 Mar 06
+*change.txt*    For Vim version 7.0aa.  Last change: 2006 Mar 16
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -728,6 +728,7 @@ Examples: >
   :s/\([abc]\)\([efg]\)/\2\1/g	 modifies "af fa bg" to "fa fa gb"
   :s/abcde/abc^Mde/		 modifies "abcde"    to "abc", "de" (two lines)
   :s/$/\^M/			 modifies "abcde"    to "abcde^M"
+  :s/\w\+/\u\0/g		 modifies "bla bla"  to "Bla Bla"
 
 Note: In previous versions CTRL-V was handled in a special way.  Since this is
 not Vi compatible, this was removed.  Use a backslash instead.
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 7e10b85d46..0cc9b34fb1 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.0aa.  Last change: 2006 Mar 15
+*options.txt*	For Vim version 7.0aa.  Last change: 2006 Mar 16
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -3768,6 +3768,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	cursor to the match.
 	The highlighting can be set with the 'i' flag in 'highlight'.
 	See also: 'hlsearch'.
+	CTRL-L can be used to add one character from after the current match
+	to the command line.
+	CTRL-R CTRL-W can be used to add the word at the end of the current
+	match, excluding the characters that were already typed.
 	NOTE: This option is reset when 'compatible' is set.
 
 						*'indentexpr'* *'inde'*
@@ -7182,10 +7186,19 @@ A jump table for the options with a short description can be found at |Q_op|.
 	    block	Allow virtual editing in Visual block mode.
 	    insert	Allow virtual editing in Insert mode.
 	    all		Allow virtual editing in all modes.
+	    onemore	Allow the cursor to move just past the end of the line
 	Virtual editing means that the cursor can be positioned where there is
 	no actual character.  This can be halfway into a Tab or beyond the end
 	of the line.  Useful for selecting a rectangle in Visual mode and
 	editing a table.
+	"onemore" is not the same, it will only allow moving the cursor just
+	after the last character of the line.  This makes some commands more
+	consistent.  Previously the cursor was always past the end of the line
+	if the line was empty.  But it is far from Vi compatible.  It may also
+	break some plugins or Vim scripts.  For example because |$| moves to a
+	different position.  Use with care!
+	It doesn't make sense to combine "all" with "onemore", but you will
+	not get a warning for it.
 
 			*'visualbell'* *'vb'* *'novisualbell'* *'novb'* *beep*
 'visualbell' 'vb'	boolean	(default off)
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 3b18a5b901..3734385fc5 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -2740,6 +2740,8 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 :undo	undo.txt	/*:undo*
 :undoj	undo.txt	/*:undoj*
 :undojoin	undo.txt	/*:undojoin*
+:undol	undo.txt	/*:undol*
+:undolist	undo.txt	/*:undolist*
 :unh	windows.txt	/*:unh*
 :unhide	windows.txt	/*:unhide*
 :unl	eval.txt	/*:unl*
@@ -6247,6 +6249,7 @@ new-multi-lang	version6.txt	/*new-multi-lang*
 new-netrw-explore	version7.txt	/*new-netrw-explore*
 new-network-files	version6.txt	/*new-network-files*
 new-omni-completion	version7.txt	/*new-omni-completion*
+new-onemore	version7.txt	/*new-onemore*
 new-operator-mod	version6.txt	/*new-operator-mod*
 new-options-5.2	version5.txt	/*new-options-5.2*
 new-options-5.4	version5.txt	/*new-options-5.4*
diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt
index fdfa71df60..e34d30d59b 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 14
+*undo.txt*      For Vim version 7.0aa.  Last change: 2006 Mar 16
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -23,6 +23,9 @@ u			Undo [count] changes.  {Vi: only one level}
 							*:u* *:un* *:undo*
 :u[ndo]			Undo one change.  {Vi: only one level}
 
+:u[ndo] {N}		Jump to after change number {N}.  See |undo-branches|
+			for the meaning of {N}.  {not in Vi}
+
 							*CTRL-R*
 CTRL-R			Redo [count] changes which were undone.  {Vi: redraw
 			screen}
@@ -114,6 +117,19 @@ 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
 state of the text.
 
+							*:undol* *:undolist*
+:undol[ist]		List the leafs in the tree of changes.  Example:
+				number changes   time ~
+				4      10        10:34:11
+				18     4         11:01:46
+
+			The "number" column is the change number.  This number
+			continuously increases and can be used to identify a
+			specific undo-able change, see |:undo|.
+			The "changes" column is the number of changes to this
+			leaf from the root of the tree.
+			The "time" column is the time this change was made.
+
 							*g-*
 g-			Go to older text state.  With a count repeat that many
 			times.  {not in Vi}
@@ -132,6 +148,7 @@ g+			Go to newer text state.  With a count repeat that many
 :later {N}m		Go to newer text state about {N} minutes later.
 :later {N}h		Go to newer text state about {N} hours later.
 
+
 Note that text states will become unreachable when undo information is cleared
 for 'undolevels'.