|
 |
f301e86 |
To: vim-dev@vim.org
|
|
|
f301e86 |
Subject: Patch 7.0.008
|
|
|
f301e86 |
Fcc: outbox
|
|
|
f301e86 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
f301e86 |
Mime-Version: 1.0
|
|
|
f301e86 |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
f301e86 |
Content-Transfer-Encoding: 8bit
|
|
|
f301e86 |
------------
|
|
|
f301e86 |
|
|
|
f301e86 |
Patch 7.0.008
|
|
|
f301e86 |
Problem: Can't call a function that uses both <SID> and {expr}. (Thomas)
|
|
|
f301e86 |
Solution: Check both the expanded and unexpanded name for <SID>.
|
|
|
f301e86 |
Files: src/eval.c
|
|
|
f301e86 |
|
|
|
f301e86 |
|
|
|
f301e86 |
*** ../vim-7.0.007/src/eval.c Wed May 10 15:22:49 2006
|
|
|
f301e86 |
--- src/eval.c Wed May 10 12:11:42 2006
|
|
|
f301e86 |
***************
|
|
|
f301e86 |
*** 11372,11378 ****
|
|
|
f301e86 |
if (argvars[2].v_type != VAR_UNKNOWN)
|
|
|
f301e86 |
{
|
|
|
f301e86 |
char_u *xp_name;
|
|
|
f301e86 |
! int xp_namelen;
|
|
|
f301e86 |
long argt;
|
|
|
f301e86 |
|
|
|
f301e86 |
rettv->vval.v_string = NULL;
|
|
|
f301e86 |
--- 11372,11378 ----
|
|
|
f301e86 |
if (argvars[2].v_type != VAR_UNKNOWN)
|
|
|
f301e86 |
{
|
|
|
f301e86 |
char_u *xp_name;
|
|
|
f301e86 |
! int xp_namelen;
|
|
|
f301e86 |
long argt;
|
|
|
f301e86 |
|
|
|
f301e86 |
rettv->vval.v_string = NULL;
|
|
|
f301e86 |
***************
|
|
|
f301e86 |
*** 18963,18969 ****
|
|
|
f301e86 |
else if (lead > 0)
|
|
|
f301e86 |
{
|
|
|
f301e86 |
lead = 3;
|
|
|
f301e86 |
! if (eval_fname_sid(lv.ll_exp_name != NULL ? lv.ll_exp_name : *pp))
|
|
|
f301e86 |
{
|
|
|
f301e86 |
/* It's "s:" or "<SID>" */
|
|
|
f301e86 |
if (current_SID <= 0)
|
|
|
f301e86 |
--- 18963,18970 ----
|
|
|
f301e86 |
else if (lead > 0)
|
|
|
f301e86 |
{
|
|
|
f301e86 |
lead = 3;
|
|
|
f301e86 |
! if ((lv.ll_exp_name != NULL && eval_fname_sid(lv.ll_exp_name))
|
|
|
f301e86 |
! || eval_fname_sid(*pp))
|
|
|
f301e86 |
{
|
|
|
f301e86 |
/* It's "s:" or "<SID>" */
|
|
|
f301e86 |
if (current_SID <= 0)
|
|
|
f301e86 |
*** ../vim-7.0.007/src/version.c Wed May 10 17:38:05 2006
|
|
|
f301e86 |
--- src/version.c Wed May 10 17:39:46 2006
|
|
|
f301e86 |
***************
|
|
|
f301e86 |
*** 668,669 ****
|
|
|
f301e86 |
--- 668,671 ----
|
|
|
f301e86 |
{ /* Add new patch number below this line */
|
|
|
f301e86 |
+ /**/
|
|
|
f301e86 |
+ 8,
|
|
|
f301e86 |
/**/
|
|
|
f301e86 |
|
|
|
f301e86 |
--
|
|
|
f301e86 |
From "know your smileys":
|
|
|
f301e86 |
% Bike accident. A bit far-fetched, I suppose; although...
|
|
|
f301e86 |
o _ _ _
|
|
|
f301e86 |
_o /\_ _ \\o (_)\__/o (_)
|
|
|
f301e86 |
_< \_ _>(_) (_)/<_ \_| \ _|/' \/
|
|
|
f301e86 |
(_)>(_) (_) (_) (_) (_)' _\o_
|
|
|
f301e86 |
|
|
|
f301e86 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
f301e86 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
f301e86 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
f301e86 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|