# HG changeset patch
# User vimboss
# Date 1134857402 0
# Node ID 1b7cac059babfb3365c0a44c0537c7aa9b286a71
# Parent  aa08661abaf7da413777a8e2b77e21cdd0691c95
updated for version 7.0172

diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
--- 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 16
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Dec 17
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,9 +30,6 @@ be worked on, but only if you sponsor Vi
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-When inside input() and using "CTRL-R =" causing an exception the command line
-isn't abandoned. (Yukihiro Nakadaira)
-
 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)
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
--- 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 16
+*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Dec 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1495,4 +1495,8 @@ Unix: When filtering text through a shel
 dropped.  Now after detecting that the child has exited try reading some more
 of its output.
 
+When inside input(), using "CTRL-R =" and the expression throws an exception
+the command line was not abandoned but it wasn't used either.  Now abandon
+typing the command line.
+
  vim:tw=78:ts=8:ft=help:norl:
diff --git a/src/syntax.c b/src/syntax.c
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -7811,7 +7811,7 @@ hl_combine_attr(char_attr, prim_attr)
 	new_en.ae_attr |= prim_attr;
     else
     {
-	spell_aep = syn_cterm_attr2entry(prim_attr);
+	spell_aep = syn_term_attr2entry(prim_attr);
 	if (spell_aep != NULL)
 	{
 	    new_en.ae_attr |= spell_aep->ae_attr;