diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-05-13 11:33:27 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-05-13 11:33:27 +0000 |
| commit | 86c9ee2182b1e7bd8f251d72ac316924f5b817d2 (patch) | |
| tree | fcf31ccc19aee6d4848942d417a00ec1408848cf | |
| parent | 223b4313c860b0ddeadc8166f11b325b66073cc8 (diff) | |
updated for version 7.0-008v7.0.008
| -rw-r--r-- | src/eval.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c index 20d9c91e1f..2e4cd12f05 100644 --- a/src/eval.c +++ b/src/eval.c @@ -11372,7 +11372,7 @@ f_input(argvars, rettv) if (argvars[2].v_type != VAR_UNKNOWN) { char_u *xp_name; - int xp_namelen; + int xp_namelen; long argt; rettv->vval.v_string = NULL; @@ -18963,7 +18963,8 @@ trans_function_name(pp, skip, flags, fdp) else if (lead > 0) { lead = 3; - if (eval_fname_sid(lv.ll_exp_name != NULL ? lv.ll_exp_name : *pp)) + if ((lv.ll_exp_name != NULL && eval_fname_sid(lv.ll_exp_name)) + || eval_fname_sid(*pp)) { /* It's "s:" or "<SID>" */ if (current_SID <= 0) diff --git a/src/version.c b/src/version.c index 17b8181c7a..3f8a31a07b 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 8, +/**/ 7, /**/ 6, |