diff options
| author | Bram Moolenaar <Bram@vim.org> | 2005-12-17 22:10:02 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2005-12-17 22:10:02 +0000 |
| commit | 3b18181f280a9c4e20d1db32d4877646d63305b3 (patch) | |
| tree | e7bfb7e8e04a3833bb3f620d6e7b32fa2f764797 | |
| parent | acf534595b76b8992b3b4cfbae3158f850a3f2a5 (diff) | |
updated for version 7.0172v7.0172
| -rw-r--r-- | runtime/doc/todo.txt | 5 | ||||
| -rw-r--r-- | runtime/doc/version7.txt | 6 | ||||
| -rw-r--r-- | src/syntax.c | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 55a63fdfb8..b7c2992319 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 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 1137456e34..cdc81d5a97 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 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 a3efa9a7f3..01a476e696 100644 --- 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; |