diff options
| author | Bram Moolenaar <Bram@vim.org> | 2009-02-04 15:27:06 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2009-02-04 15:27:06 +0000 |
| commit | b67cc16e02ecf4de87431a3098476a3184287c2f (patch) | |
| tree | 721694e09c29ba6ce2242cc6df2b40d53805d5eb | |
| parent | 0725608d1a501e8ccc82153102fdc7e26478577f (diff) | |
| download | vim-git-b67cc16e02ecf4de87431a3098476a3184287c2f.tar.gz | |
updated for version 7.2-098v7.2.098
| -rw-r--r-- | src/eval.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c index 76a6044a8..98979b175 100644 --- a/src/eval.c +++ b/src/eval.c @@ -3928,7 +3928,7 @@ eval0(arg, rettv, nextcmd, evaluate) /* * Handle top level expression: - * expr1 ? expr0 : expr0 + * expr2 ? expr1 : expr1 * * "arg" must point to the first non-white of the expression. * "arg" is advanced to the next non-white after the recognized expression. @@ -19912,7 +19912,7 @@ ex_function(eap) : eval_isnamec(arg[j]))) ++j; if (arg[j] != NUL) - emsg_funcname(e_invarg2, arg); + emsg_funcname((char *)e_invarg2, arg); } } diff --git a/src/version.c b/src/version.c index d5e44843d..4aeef69e4 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 98, +/**/ 97, /**/ 96, |