updated for version 7.0172

diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 55a63fdfb82a0918646d1f5bbf77e0d74112ef22..b7c2992319e31abe81529cebdae08da8bc48775a 100644 (file)
--- 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 Vim development.  See |sponsor|.
                                                        *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
index 1137456e34546e97cb3a9dd0c07aaa0839600811..cdc81d5a9716f07da9262031a5938e33b557ee22 100644 (file)
--- 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 shell command some resulting text may be
 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
index a3efa9a7f3b0736441a7324e1061c5e6f0d84682..01a476e696fd70d1e385a9473401f5b77a7df810 100644 (file)
--- 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;