diff --git a/runtime/autoload/ccomplete.vim b/runtime/autoload/ccomplete.vim
index a2210d7..f804710 100644
--- a/runtime/autoload/ccomplete.vim
+++ b/runtime/autoload/ccomplete.vim
@@ -1,7 +1,7 @@
 " Vim completion script
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2005 Oct 06
+" Last Change:	2005 Dec 18
 
 
 " This function is used for the 'omnifunc' option.
@@ -87,7 +87,7 @@
       if diclist[i]['kind'] == 'v'
 	let line = diclist[i]['cmd']
 	if line[0] == '/' && line[1] == '^'
-	  let col = match(line, items[0])
+	  let col = match(line, '\<' . items[0] . '\>')
 	  call extend(res, s:Nextitem(strpart(line, 2, col - 2), items[1:]))
 	endif
       endif
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 5d49e84..28edb4d 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 7.0aa.  Last change: 2005 Dec 11
+*autocmd.txt*   For Vim version 7.0aa.  Last change: 2005 Dec 18
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -447,6 +447,8 @@
 				make some coffee. :)  See |CursorHold-example|
 				for previewing tags.
 				This event is only triggered in Normal mode.
+				While recording the CursorHold event is not
+				triggered. |q|
 				Note: Interactive commands cannot be used for
 				this event.  There is no hit-enter prompt,
 				the screen is updated directly (when needed).
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index b7c2992..8b27dde 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 17
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Dec 18
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,10 +30,6 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-When 'delcombine' is set in Select mode before a character with a combining
-char the combining char is deleted when it shouldn't. (Tony Mechelynck, Nov
-27)
-
 ccomplete:
 - When an option is set: In completion mode and the user types (identifier)
   characters, advance to the first match instead of removing the popup menu.
@@ -41,10 +37,11 @@
 - Complete the longest common match instead of the first match?
     For all kinds of completions?  Configurable?
 - !_TAG_FILE_FORMAT and it's ilk are listed in the global completions
-- When completing something that is a structure, add the "." or "->".
-- When a typedef or struct is local to a file only use it in that file?
+    Can't reproduce it right now...
 - Window resize when poup is displayed
-- page-up / page-down
+- When completing something that is a structure, add the "." or "->" right
+  away.  How to figure out if it's a pointer or not?
+- When a typedef or struct is local to a file only use it in that file?
 
 spelling:
 - Use KEEPCASE instead of "KEP".  It applies to the word including affixes
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index cdc81d5..b886ead 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 17
+*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Dec 18
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1499,4 +1499,11 @@
 the command line was not abandoned but it wasn't used either.  Now abandon
 typing the command line.
 
+'delcombine' was also used in Visual and Select mode and for commands like
+"cl".  That was illogical and has been disabled.
+
+When recording while a CursorHold autocommand was defined special keys would
+appear in the register.  Now the CursorHold event is not triggered while
+recording.
+
  vim:tw=78:ts=8:ft=help:norl: