Mercurial > vim
changeset 1533:8abc0abf8cbd v7.1.248
updated for version 7.1-248
author | vimboss |
---|---|
date | Wed, 13 Feb 2008 11:42:46 +0000 |
parents | 87b9f21264a7 |
children | bdfbf8ef447a |
files | runtime/doc/eval.txt src/eval.c src/mark.c src/version.c |
diffstat | 4 files changed, 23 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.1. Last change: 2008 Jan 11 +*eval.txt* For Vim version 7.1. Last change: 2008 Feb 13 VIM REFERENCE MANUAL by Bram Moolenaar @@ -4523,6 +4523,9 @@ setpos({expr}, {list}) character. E.g., a position within a <Tab> or after the last character. + Returns 0 when the position could be set, -1 otherwise. + An error message is given if {expr} is invalid. + Also see |getpos()| This does not restore the preferred column for moving
--- a/src/eval.c +++ b/src/eval.c @@ -14776,24 +14776,31 @@ f_setpos(argvars, rettv) int fnum; char_u *name; + rettv->vval.v_number = -1; name = get_tv_string_chk(argvars); if (name != NULL) { if (list2fpos(&argvars[1], &pos, &fnum) == OK) { --pos.col; - if (name[0] == '.') /* cursor */ - { + if (name[0] == '.' && name[1] == NUL) + { + /* set cursor */ if (fnum == curbuf->b_fnum) { curwin->w_cursor = pos; check_cursor(); + rettv->vval.v_number = 0; } else EMSG(_(e_invarg)); } - else if (name[0] == '\'') /* mark */ - (void)setmark_pos(name[1], &pos, fnum); + else if (name[0] == '\'' && name[1] != NUL && name[2] == NUL) + { + /* set mark */ + if (setmark_pos(name[1], &pos, fnum) == OK) + rettv->vval.v_number = 0; + } else EMSG(_(e_invarg)); }