projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 5ee5dc07 AM |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.0.008 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.0.008 | |
| 11 | Problem: Can't call a function that uses both <SID> and {expr}. (Thomas) | |
| 12 | Solution: Check both the expanded and unexpanded name for <SID>. | |
| 13 | Files: src/eval.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.0.007/src/eval.c Wed May 10 15:22:49 2006 | |
| 17 | --- src/eval.c Wed May 10 12:11:42 2006 | |
| 18 | *************** | |
| 19 | *** 11372,11378 **** | |
| 20 | if (argvars[2].v_type != VAR_UNKNOWN) | |
| 21 | { | |
| 22 | char_u *xp_name; | |
| 23 | ! int xp_namelen; | |
| 24 | long argt; | |
| 25 | ||
| 26 | rettv->vval.v_string = NULL; | |
| 27 | --- 11372,11378 ---- | |
| 28 | if (argvars[2].v_type != VAR_UNKNOWN) | |
| 29 | { | |
| 30 | char_u *xp_name; | |
| 31 | ! int xp_namelen; | |
| 32 | long argt; | |
| 33 | ||
| 34 | rettv->vval.v_string = NULL; | |
| 35 | *************** | |
| 36 | *** 18963,18969 **** | |
| 37 | else if (lead > 0) | |
| 38 | { | |
| 39 | lead = 3; | |
| 40 | ! if (eval_fname_sid(lv.ll_exp_name != NULL ? lv.ll_exp_name : *pp)) | |
| 41 | { | |
| 42 | /* It's "s:" or "<SID>" */ | |
| 43 | if (current_SID <= 0) | |
| 44 | --- 18963,18970 ---- | |
| 45 | else if (lead > 0) | |
| 46 | { | |
| 47 | lead = 3; | |
| 48 | ! if ((lv.ll_exp_name != NULL && eval_fname_sid(lv.ll_exp_name)) | |
| 49 | ! || eval_fname_sid(*pp)) | |
| 50 | { | |
| 51 | /* It's "s:" or "<SID>" */ | |
| 52 | if (current_SID <= 0) | |
| 53 | *** ../vim-7.0.007/src/version.c Wed May 10 17:38:05 2006 | |
| 54 | --- src/version.c Wed May 10 17:39:46 2006 | |
| 55 | *************** | |
| 56 | *** 668,669 **** | |
| 57 | --- 668,671 ---- | |
| 58 | { /* Add new patch number below this line */ | |
| 59 | + /**/ | |
| 60 | + 8, | |
| 61 | /**/ | |
| 62 | ||
| 63 | -- | |
| 64 | From "know your smileys": | |
| 65 | % Bike accident. A bit far-fetched, I suppose; although... | |
| 66 | o _ _ _ | |
| 67 | _o /\_ _ \\o (_)\__/o (_) | |
| 68 | _< \_ _>(_) (_)/<_ \_| \ _|/' \/ | |
| 69 | (_)>(_) (_) (_) (_) (_)' _\o_ | |
| 70 | ||
| 71 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 72 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 73 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 74 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |