diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 8535d5c..821c47e 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 Dec 11
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Dec 12
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,24 +30,6 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-When editing a file "a" that is a symbolic link to "b", while another Vim is
-editing "b", there is no warning.  Follow symlink to make swap file name?
-Patch from Stefano Zacchiroli.  Updated by James Vega, Dec 2.
-
-Using pipes for filter commands: provide some way to type a password, keep
-stderr in/out open for this? (Konstanti Rozinov)
-New problem: password is echoed.  Put terminal in cooked mode and don't read
-from terminal?
-
-Allow the user to handle the situation that a swap file already exists.
-Option to define a function to be called?  Function would return the character
-that the dialog provides.  Would make it possible to bring the other Vim to
-the foreground and abort the edit.  Or hard-code this?
-
-To support mapping <F4> to be used as <F4>{motion}: Add operator that
-executes a user defined function. '[ and '] marks are at start and end of
-text.  ":map <F4> :set opfunc=MyOp<CR>gy".
-
 Patch from Yasuhiro Matsumoto: ":e ++enc=xxx" keeps encoding for conversion
 errors and illegal bytes.  Make default to replace bad bytes/characters with
 '?' and allow for two alternatives:
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index a8acdda..ead3618 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Dec 11
+*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Dec 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -29,6 +29,7 @@
 POSIX compatibility			|new-posix|
 Debugger support			|new-debug-support|
 Remote file explorer			|new-netrw-explore|
+Define an operator			|new-define-operator|
 Various new items			|new-items-7|
 
 IMPROVEMENTS				|improvements-7|
@@ -167,7 +168,7 @@
 
 The |[s| and |]s| commands can be used to move to the next or previous error.
 The |zg| and |zw| commands can be used to add good and wrong words.
-The |z?| command can be used to correct the word.
+The |z=| command can be used to correct the word.
 The |:mkspell| command is used to generate a Vim spell file from word lists.
 
 The "undercurl" highlighting attribute was added to nicely point out spelling
@@ -341,6 +342,18 @@
 The netrw plugin is maintained by Charles Campbell.
 
 
+Define an operator					*new-define-operator*
+------------------
+
+Previously it was not possible to define your own operator; a command that is
+followed by a {motion}.  Vim 7 introduces the 'operatorfunc' option and the
+|g@| operator.  This makes it possible to define a mapping that works like an
+operator.  The actual work is then done by a function, which is invoked
+through the |g@| operator.
+
+See |:map-operator| for the explanation and an example.
+
+
 Various new items					*new-items-7*
 -----------------
 
@@ -573,17 +586,19 @@
 
 Mac: support for multi-byte characters. (Da Woon Jung)
 
-GUI font selector for Motif. (Marcin Dalecki)
-
-Nicer toolbar buttons for Motif. (Marcin Dalecki)
-
-Mnemonics for the Motif find/replace dialog. (Marcin Dalecki)
+Mac: Support the xterm mouse in the non-GUI version.
 
 Mac: better integration with Xcode.  Post a fake mouse-up event after the odoc
 event and the drag receive handler to work around a stall after Vim loads a
 file.  Fixed an off-by-one line number error. (Da Woon Jung)
 
 Added the t_SI and t_EI escape sequences for starting and ending Insert mode.
+GUI font selector for Motif. (Marcin Dalecki)
+
+Nicer toolbar buttons for Motif. (Marcin Dalecki)
+
+Mnemonics for the Motif find/replace dialog. (Marcin Dalecki)
+
 To be used to set the cursor shape to a bar or a block.  No default values,
 they are not supported by termcap/terminfo.
 
@@ -707,6 +722,10 @@
 used path then doesn't matter and the check for editing the same file is much
 more reliable.
 
+Unix: When editing a file through a symlink the swap file would use the name
+of the symlink.  Now use the name of the actual file, so that editing the same
+file twice is detected. (suggestions by Stefano Zacchiroli and James Vega)
+
 Client-server communication now supports 'encoding'.  When setting 'encoding'
 in a Vim server to "utf-8", and using "vim --remote fname" in a console,
 "fname" is converted from the console encoding to utf-8.  Also allows Vims
@@ -869,6 +888,10 @@
 actually different from the file content.  Don't set the file name, unless the
 'P' flag is present in 'cpoptions'.
 
+When starting to edit a new file and the directory for the file doesn't exist
+then Vim will report "[New DIRECTORY]" instead of "[New File] to give the user
+a hint that something might be wrong.
+
 ==============================================================================
 COMPILE TIME CHANGES					*compile-changes-7*
 
@@ -1438,4 +1461,8 @@
 When appending to to current file the "not edited" flag would be reset.
 ":w" would overwrite the file accidentally.
 
+Unix: When filtering text with an external command Vim would still read input,
+causing text typed for the command (e.g., a password) to be eaten and echoed.
+Don't read input when the terminal is in cooked mode.
+
  vim:tw=78:ts=8:ft=help:norl: