--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2006 Mar 01
+*todo.txt*      For Vim version 7.0aa.  Last change: 2006 Mar 02
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,7 +30,19 @@ be worked on, but only if you sponsor Vi
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Test58 and test59: also test with NOSPLITSUGS?
+Add setpos(), opposite  of getpos().
+7   Add the markclear() function to delete a mark in another buffer.  Charles
+    Campbell (2004 Jan 9)
+    http://mysite.verizon.net/astronaut/vim/index.html#Patch
+    Implement setmark(markname, lnum [, col [, filename]]) instead?
+    When "lnum" is zero delete the mark.
+    When "filename" has no wildcards and there is no matching buffer, add
+    the buffer (unlisted).
+
+Make match() use {start} differently when using {count} argument.
+
+Function to get and restore window position?  Including topline, column
+offset, etc.  Use dictionary to store the info?
 
 Crash with X command server (Ciaran McCreesh).
 
@@ -39,7 +51,7 @@ maintanance.  Is there another solution?
 
 spelling:
 - Also use the spelling dictionary for dictionary completion.
-  When 'dictionary' is empty and/or when "kspell" is in 'complete'.
+  -> proper case compare against pattern, also for multi-byte
 - Using KEEPCASE flag still allows all-upper word, docs say it doesn't.
   Don't allow it, because there is no other way to do this.
 - Use runtime/cleanadd script to cleanup .add files.  When to invoke it?
@@ -279,6 +291,8 @@ 8   Add a command to jump to a certain k
     taglist() can be used.
 
 Adjust src/main.aap for installing manpages like in Makefile.
+And for generating Vim.app for the Mac.
+Install spell files with src/main.aap.
 
 When editing a file with both utf-8 and latin1 text Vim always falls back to
 latin1.  Add a command to convert the latin1 characters to utf-8?
@@ -1394,7 +1408,6 @@ 8   Charles Campbell asks for method to 
     syntax items (to add @Spell).
     Add ":syntax contains {pattern} add=@Spell" command?  A bit like ":syn
     cluster" but change the contains list directly for matching syntax items.
-8   Install spell files with src/main.aap.
 -   References: MySpell library (in OpenOffice.org).
 	http://spellchecker.mozdev.org/source.html
 	http://whiteboard.openoffice.org/source/browse/whiteboard/lingucomponent/source/spellcheck/myspell/
@@ -1715,13 +1728,6 @@ 8   Add ":fungroup" command, to group fu
     Alternative: Support packages.  {package-name}:{function-name}().
     Packages are loaded automatically when first used, from
     $VIMRUNTIME/packages (or use a search path).
-7   Add the markclear() function to delete a mark in another buffer.  Charles
-    Campbell (2004 Jan 9)
-    http://mysite.verizon.net/astronaut/vim/index.html#Patch
-    Implement setmark(markname, lnum [, col [, filename]]) instead?
-    When "lnum" is zero delete the mark.
-    When "filename" has no wildcards and there is no matching buffer, add
-    the buffer (unlisted).
 7   Pre-parse or compile Vim scripts into a bytecode.
     1. Put the bytecode with the original script, with an ":if
        has('bytecode')" around it, so that it's only used with a Vim that

--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt*  For Vim version 7.0aa.  Last change: 2006 Mar 01
+*version7.txt*  For Vim version 7.0aa.  Last change: 2006 Mar 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -553,6 +553,8 @@ New and extended functions: ~
 |complete_check()|	check for key pressed, for 'completefunc'
 |copy()|		make a shallow copy of a List or Dictionary
 |count()|		count nr of times a value is in a List or Dictionary
+|cursor()|		also accepts an offset for 'virtualedit', and
+			the first argument can be a list: [lnum, col, off]
 |deepcopy()|		make a full copy of a List or Dictionary
 |empty()|		check if List or Dictionary is empty
 |getloclist()|		list of location list items (Yegappan Lakshmanan)
@@ -573,6 +575,7 @@ New and extended functions: ~
 |getfperm()|		get file permission string (Nikolai Weibull)
 |getftype()|		get type of file (Nikolai Weibull)
 |getline()|		with second argument: get List with buffer lines
+|getpos()|		return a list with the position of cursor, mark, etc.
 |has_key()|		check whether a key appears in a Dictionary
 |inputlist()|		select an entry from a list
 |insert()|		insert an item somewhere in a List
@@ -1211,6 +1214,9 @@ just before it is invoked
 VMS: Occasionally CR characters were inserted in the file.  Expansion of
 environment variables was not correct. (Zoltan Arpadffy)
 
+VMS: Improved low level char input (affects just console mode). (Zoltan
+Arpadffy)
+
 UTF-8: When 'delcombine' is set "dw" only deleted the last combining character
 from the first character of the word.
 

--- a/src/testdir/test58.in
+++ b/src/testdir/test58.in
@@ -97,6 +97,9 @@ gg:/^addstart/+1,/^addend/-1w! Xtest.lat
 :call TestOne('6', '6')
 :call TestOne('7', '7')
 :"
+:" NOSLITSUGS
+:call TestOne('8', '8')
+:"
 gg:/^test output:/,$wq! test.out
 ENDTEST
 
@@ -117,8 +120,6 @@ KEP =
 RAR ?
 BAD !
 
-#NOSPLITSUGS
-
 PFX I N 1
 PFX I 0 in .
 
@@ -183,8 +184,6 @@ KEP =
 RAR ?
 BAD !
 
-#NOSPLITSUGS
-
 PFX I N 1
 PFX I 0 in .
 
@@ -340,8 +339,6 @@ KEP =
 RAR ?
 BAD !
 
-#NOSPLITSUGS
-
 PFX I N 1
 PFX I 0 in .
 
@@ -596,4 +593,24 @@ bad: mee meea2 prabar probarmaat middle 
 	leadprobar
 badend
 
+Test NOSLITSUGS
+
+8affstart
+SET ISO8859-1
+
+NOSPLITSUGS
+8affend
+
+8dicstart
+1234
+foo
+bar
+faabar
+8dicend
+
+8good: foo bar faabar
+bad: foobar barfoo
+badend
+
+
 test output: