|
 |
ac38385 |
To: vim-dev@vim.org
|
|
|
ac38385 |
Subject: patch 7.1.098
|
|
|
ac38385 |
Fcc: outbox
|
|
|
ac38385 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
ac38385 |
Mime-Version: 1.0
|
|
|
ac38385 |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
ac38385 |
Content-Transfer-Encoding: 8bit
|
|
|
ac38385 |
------------
|
|
|
ac38385 |
|
|
|
ac38385 |
Patch 7.1.098
|
|
|
ac38385 |
Problem: ":call s:var()" doesn't work if "s:var" is a Funcref. (Andy Wokula)
|
|
|
ac38385 |
Solution: Before converting "s:" into a script ID, check if it is a Funcref.
|
|
|
ac38385 |
Files: src/eval.c
|
|
|
ac38385 |
|
|
|
ac38385 |
|
|
|
ac38385 |
*** ../vim-7.1.097/src/eval.c Wed Sep 5 21:45:54 2007
|
|
|
ac38385 |
--- src/eval.c Thu Sep 6 12:11:19 2007
|
|
|
ac38385 |
***************
|
|
|
ac38385 |
*** 19367,19372 ****
|
|
|
ac38385 |
--- 19367,19394 ----
|
|
|
ac38385 |
if (lv.ll_name == NULL)
|
|
|
ac38385 |
{
|
|
|
ac38385 |
/* Error found, but continue after the function name. */
|
|
|
ac38385 |
+ *pp = end;
|
|
|
ac38385 |
+ goto theend;
|
|
|
ac38385 |
+ }
|
|
|
ac38385 |
+
|
|
|
ac38385 |
+ /* Check if the name is a Funcref. If so, use the value. */
|
|
|
ac38385 |
+ if (lv.ll_exp_name != NULL)
|
|
|
ac38385 |
+ {
|
|
|
ac38385 |
+ len = (int)STRLEN(lv.ll_exp_name);
|
|
|
ac38385 |
+ name = deref_func_name(lv.ll_exp_name, &len;;
|
|
|
ac38385 |
+ if (name == lv.ll_exp_name)
|
|
|
ac38385 |
+ name = NULL;
|
|
|
ac38385 |
+ }
|
|
|
ac38385 |
+ else
|
|
|
ac38385 |
+ {
|
|
|
ac38385 |
+ len = (int)(end - *pp);
|
|
|
ac38385 |
+ name = deref_func_name(*pp, &len;;
|
|
|
ac38385 |
+ if (name == *pp)
|
|
|
ac38385 |
+ name = NULL;
|
|
|
ac38385 |
+ }
|
|
|
ac38385 |
+ if (name != NULL)
|
|
|
ac38385 |
+ {
|
|
|
ac38385 |
+ name = vim_strsave(name);
|
|
|
ac38385 |
*pp = end;
|
|
|
ac38385 |
goto theend;
|
|
|
ac38385 |
}
|
|
|
ac38385 |
*** ../vim-7.1.097/src/version.c Thu Sep 6 13:32:53 2007
|
|
|
ac38385 |
--- src/version.c Thu Sep 6 14:24:10 2007
|
|
|
ac38385 |
***************
|
|
|
ac38385 |
*** 668,669 ****
|
|
|
ac38385 |
--- 668,671 ----
|
|
|
ac38385 |
{ /* Add new patch number below this line */
|
|
|
ac38385 |
+ /**/
|
|
|
ac38385 |
+ 98,
|
|
|
ac38385 |
/**/
|
|
|
ac38385 |
|
|
|
ac38385 |
--
|
|
|
ac38385 |
Not too long ago, a program was something you watched on TV...
|
|
|
ac38385 |
|
|
|
ac38385 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
ac38385 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
ac38385 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
ac38385 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|