diff options
| author | Bram Moolenaar <Bram@vim.org> | 2005-08-08 22:06:28 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2005-08-08 22:06:28 +0000 |
| commit | 8af244281c3a1afe1ca39cbf6ffb72ad42488c56 (patch) | |
| tree | a43c8211ae5e66c457f96218a245bba6bc035b6c | |
| parent | f57907ec2c65b5f06813630390b4736ca1111265 (diff) | |
| download | vim-git-8af244281c3a1afe1ca39cbf6ffb72ad42488c56.tar.gz | |
updated for version 7.0125v7.0125
| -rw-r--r-- | runtime/doc/todo.txt | 4 | ||||
| -rw-r--r-- | src/eval.c | 21 |
2 files changed, 23 insertions, 2 deletions
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index c1a02fc94..5660390a9 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 Aug 05 +*todo.txt* For Vim version 7.0aa. Last change: 2005 Aug 08 VIM REFERENCE MANUAL by Bram Moolenaar @@ -30,6 +30,8 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. *known-bugs* -------------------- Known bugs and current work ----------------------- +Spell checking: code for pre-compressing tree. (Olaf Seibert) + Mac unicode patch (Da Woon Jung): - selecting proportional font breaks display - UTF-8 text causes display problems. Font replacement causes this. diff --git a/src/eval.c b/src/eval.c index 56811ab56..6919bf1ff 100644 --- a/src/eval.c +++ b/src/eval.c @@ -15161,8 +15161,26 @@ find_name_end(arg, expr_start, expr_end, flags) || *p == '{' || ((flags & FNE_INCL_BR) && (*p == '[' || *p == '.')) || mb_nest != 0 - || br_nest != 0); ++p) + || br_nest != 0); mb_ptr_adv(p)) { + if (*p == '\'') + { + /* skip over 'string' to avoid counting [ and ] inside it. */ + for (p = p + 1; *p != NUL && *p != '\''; mb_ptr_adv(p)) + ; + if (*p == NUL) + break; + } + else if (*p == '"') + { + /* skip over "str\"ing" to avoid counting [ and ] inside it. */ + for (p = p + 1; *p != NUL && *p != '"'; mb_ptr_adv(p)) + if (*p == '\\' && p[1] != NUL) + ++p; + if (*p == NUL) + break; + } + if (mb_nest == 0) { if (*p == '[') @@ -15170,6 +15188,7 @@ find_name_end(arg, expr_start, expr_end, flags) else if (*p == ']') --br_nest; } + if (br_nest == 0) { if (*p == '{') |