diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 59b52fd0e47cba9e6a329bc3ca644dda572ddfd7..06c8b5d56917e4c4abc03e33f6c737b999051f9e 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt* For Vim version 7.0aa. Last change: 2005 Jul 19
+*todo.txt* For Vim version 7.0aa. Last change: 2005 Jul 20
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -30,10 +30,14 @@ be worked on, but only if you sponsor Vim development. See |sponsor|.
*known-bugs*
-------------------- Known bugs and current work -----------------------
+About HTML tag pairing: http://www.w3.org/TR/html4/index/elements.html
+
":e *.foo" completion with file name starting with "+" should be escaped.
VMS patch for term.c also in Vim 6.3 (Zoltan Arpadffy)
+Make_cyg.mak files for Vim 6.3 from Tony Mechelynck?
+
Add extra list of file locations. Can be used with:
:ltag list of matching tags, like :tselect
@@ -379,11 +383,6 @@ Vi incompatibility:
Also: A mark is lost after: make change, undo, redo and undo.
Example: "{d''" then "u" then "d''": deletes an extra line, because the ''
position is one line down. (Veselinovic)
-8 ":change" in a single-line file adds an empty line. When the file used to
- be longer a "~" line is displayed, but there really is an empty line.
- (Haakon Riiser, 2003 Dec 3 and Dec 16)
-8 ":append" and ":insert" in an empty file add an extra empty line. (Haakon
- Riiser, 2003 Dec 3) Test for ML_EMPTY.
8 When stdin is not a tty, and Vim reads commands from it, an error should
make Vim exit.
7 Unix Vim (not gvim): Typing CTRL-C in Ex mode should finish the line
@@ -1820,8 +1819,6 @@ Messages:
lines that aren't executed? Perhaps move the echoing to do_cmdline()?
8 Use 'report' for ":bdel"? (Krishna) To avoid these messages when using a
script.
-8 "vim --version" output goes to stderr, should be stdout. Can all output
- from messages using printf() go to stdout?
- Delete message after new command has been entered and have waited for key.
Perhaps after ten seconds?
- Make message history available in "msg" variables: msg1, msg2, .. msg9.
@@ -3138,6 +3135,8 @@ Debug mode:
Various improvements:
+7 [t to move to previous xml/html tag (like "vatov"), ]t to move to next
+ ("vatv").
8 Add ":rename" command: rename the file of the current buffer and rename
the buffer. Buffer may be modified.
- Perhaps ":cexpr" could read errors from a list?
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index 49968553da96ec0c6e82630b5241f688bae95673..cf7f03643140153f60ede1902f52e9e24a7ddebe 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -351,8 +351,8 @@ New functions: ~
|add()| append an item to a List
|append()| append List of lines to the buffer
-|browsedir()| Dialog to select a directory.
-|byteidx()| Index of a character. (Ilya Sher)
+|browsedir()| dialog to select a directory
+|byteidx()| index of a character (Ilya Sher)
|call()| call a function with List as arguments
|copy()| make a shallow copy of a List or Dictionary
|count()| count nr of times a value is in a List or Dictionary
@@ -362,15 +362,17 @@ New functions: ~
|extend()| append one List to another or add items from one
Dictionary to another
|filter()| remove selected items from a List or Dictionary
-|finddir()| Find a directory in 'path'.
-|findfile()| Find a file in 'path'. (Johannes Zellner)
-|foldtextresult()| The text displayed for a closed fold at line "lnum".
+|finddir()| find a directory in 'path'
+|findfile()| find a file in 'path' (Johannes Zellner)
+|foldtextresult()| the text displayed for a closed fold at line "lnum"
|function()| make a Funcref out of a function name
|get()| get an item from a List or Dictionary
-|getfontname()| Get actual font name being used.
-|getfperm()| Get file permission string. (Nikolai Weibull)
-|getftype()| Get type of file. (Nikolai Weibull)
-|getline()| With second argument: get List with buffer lines
+|getbufline()| get a line or list of lines from a specified buffer
+ (Yegappan Lakshmanan)
+|getfontname()| get actual font name being used
+|getfperm()| get file permission string (Nikolai Weibull)
+|getftype()| get type of file (Nikolai Weibull)
+|getline()| with second argument: get List with buffer lines
|has_key()| check whether a key appears in a Dictionary
|insert()| insert an item somewhere in a List
|items()| get List of Dictionary key-value pairs
@@ -384,7 +386,7 @@ New functions: ~
|mkdir()| create a directory
|readfile()| read a file into a list of lines
|remove()| remove one or more items from a List or Dictionary
-|repeat()| Repeat "expr" "count" times. (Christophe Poucet)
+|repeat()| repeat "expr" "count" times (Christophe Poucet)
|reverse()| reverse the order of a List
|setqflist()| create a quickfix list (Yegappan Lakshmanan)
|sort()| sort a List
@@ -392,10 +394,10 @@ New functions: ~
|split()| split a String into a List
|spellbadword()| get a badly spelled word
|spellsuggest()| get suggestions for correct spelling
-|string()| String representation of a List or Dictionary
-|system()| Filters {input} through a shell command.
-|taglist()| Get list of matching tags. (Yegappan Lakshmanan)
-|tr()| Translate characters. (Ron Aaron)
+|string()| string representation of a List or Dictionary
+|system()| filters {input} through a shell command
+|taglist()| get list of matching tags (Yegappan Lakshmanan)
+|tr()| translate characters (Ron Aaron)
|values()| get List of Dictionary values
|writefile()| write a list of lines into a file
diff --git a/src/main.c b/src/main.c
index 1b64c343544939e3340fcaf9ab091d9678468966..0f507e7a348e594d2fd234142ec089aecec943ba 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1478,7 +1478,7 @@ scripterror:
* directory. This is only done if the 'exrc' option is set.
* Because of security reasons we disallow shell and write commands
* now, except for unix if the file is owned by the user or 'secure'
- * option has been reset in environmet of global ".exrc" or ".vimrc".
+ * option has been reset in environment of global ".exrc" or ".vimrc".
* Only do this if VIMRC_FILE is not the same as USR_VIMRC_FILE or
* SYS_VIMRC_FILE.
*/