|
 |
201dce2 |
To: vim-dev@vim.org
|
|
|
201dce2 |
Subject: Patch 7.2.337
|
|
|
201dce2 |
Fcc: outbox
|
|
|
201dce2 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
201dce2 |
Mime-Version: 1.0
|
|
|
201dce2 |
Content-Type: text/plain; charset=UTF-8
|
|
|
201dce2 |
Content-Transfer-Encoding: 8bit
|
|
|
201dce2 |
------------
|
|
|
201dce2 |
|
|
|
201dce2 |
Patch 7.2.337
|
|
|
201dce2 |
Problem: The :compiler command doesn't function properly when invoked in a
|
|
|
201dce2 |
function.
|
|
|
201dce2 |
Solution: Add "g:" before "current_compiler". (Yukihiro Nakadaira)
|
|
|
201dce2 |
Files: src/ex_cmds2.c
|
|
|
201dce2 |
|
|
|
201dce2 |
|
|
|
201dce2 |
*** ../vim-7.2.336/src/ex_cmds2.c 2009-05-16 21:16:12.000000000 +0200
|
|
|
201dce2 |
--- src/ex_cmds2.c 2010-01-19 16:02:53.000000000 +0100
|
|
|
201dce2 |
***************
|
|
|
201dce2 |
*** 2496,2509 ****
|
|
|
201dce2 |
* To remain backwards compatible "current_compiler" is always
|
|
|
201dce2 |
* used. A user's compiler plugin may set it, the distributed
|
|
|
201dce2 |
* plugin will then skip the settings. Afterwards set
|
|
|
201dce2 |
! * "b:current_compiler" and restore "current_compiler". */
|
|
|
201dce2 |
! old_cur_comp = get_var_value((char_u *)"current_compiler");
|
|
|
201dce2 |
if (old_cur_comp != NULL)
|
|
|
201dce2 |
old_cur_comp = vim_strsave(old_cur_comp);
|
|
|
201dce2 |
do_cmdline_cmd((char_u *)
|
|
|
201dce2 |
"command -nargs=* CompilerSet setlocal <args>");
|
|
|
201dce2 |
}
|
|
|
201dce2 |
! do_unlet((char_u *)"current_compiler", TRUE);
|
|
|
201dce2 |
do_unlet((char_u *)"b:current_compiler", TRUE);
|
|
|
201dce2 |
|
|
|
201dce2 |
sprintf((char *)buf, "compiler/%s.vim", eap->arg);
|
|
|
201dce2 |
--- 2496,2510 ----
|
|
|
201dce2 |
* To remain backwards compatible "current_compiler" is always
|
|
|
201dce2 |
* used. A user's compiler plugin may set it, the distributed
|
|
|
201dce2 |
* plugin will then skip the settings. Afterwards set
|
|
|
201dce2 |
! * "b:current_compiler" and restore "current_compiler".
|
|
|
201dce2 |
! * Explicitly prepend "g:" to make it work in a function. */
|
|
|
201dce2 |
! old_cur_comp = get_var_value((char_u *)"g:current_compiler");
|
|
|
201dce2 |
if (old_cur_comp != NULL)
|
|
|
201dce2 |
old_cur_comp = vim_strsave(old_cur_comp);
|
|
|
201dce2 |
do_cmdline_cmd((char_u *)
|
|
|
201dce2 |
"command -nargs=* CompilerSet setlocal <args>");
|
|
|
201dce2 |
}
|
|
|
201dce2 |
! do_unlet((char_u *)"g:current_compiler", TRUE);
|
|
|
201dce2 |
do_unlet((char_u *)"b:current_compiler", TRUE);
|
|
|
201dce2 |
|
|
|
201dce2 |
sprintf((char *)buf, "compiler/%s.vim", eap->arg);
|
|
|
201dce2 |
***************
|
|
|
201dce2 |
*** 2514,2520 ****
|
|
|
201dce2 |
do_cmdline_cmd((char_u *)":delcommand CompilerSet");
|
|
|
201dce2 |
|
|
|
201dce2 |
/* Set "b:current_compiler" from "current_compiler". */
|
|
|
201dce2 |
! p = get_var_value((char_u *)"current_compiler");
|
|
|
201dce2 |
if (p != NULL)
|
|
|
201dce2 |
set_internal_string_var((char_u *)"b:current_compiler", p);
|
|
|
201dce2 |
|
|
|
201dce2 |
--- 2515,2521 ----
|
|
|
201dce2 |
do_cmdline_cmd((char_u *)":delcommand CompilerSet");
|
|
|
201dce2 |
|
|
|
201dce2 |
/* Set "b:current_compiler" from "current_compiler". */
|
|
|
201dce2 |
! p = get_var_value((char_u *)"g:current_compiler");
|
|
|
201dce2 |
if (p != NULL)
|
|
|
201dce2 |
set_internal_string_var((char_u *)"b:current_compiler", p);
|
|
|
201dce2 |
|
|
|
201dce2 |
***************
|
|
|
201dce2 |
*** 2523,2534 ****
|
|
|
201dce2 |
{
|
|
|
201dce2 |
if (old_cur_comp != NULL)
|
|
|
201dce2 |
{
|
|
|
201dce2 |
! set_internal_string_var((char_u *)"current_compiler",
|
|
|
201dce2 |
old_cur_comp);
|
|
|
201dce2 |
vim_free(old_cur_comp);
|
|
|
201dce2 |
}
|
|
|
201dce2 |
else
|
|
|
201dce2 |
! do_unlet((char_u *)"current_compiler", TRUE);
|
|
|
201dce2 |
}
|
|
|
201dce2 |
}
|
|
|
201dce2 |
}
|
|
|
201dce2 |
--- 2524,2535 ----
|
|
|
201dce2 |
{
|
|
|
201dce2 |
if (old_cur_comp != NULL)
|
|
|
201dce2 |
{
|
|
|
201dce2 |
! set_internal_string_var((char_u *)"g:current_compiler",
|
|
|
201dce2 |
old_cur_comp);
|
|
|
201dce2 |
vim_free(old_cur_comp);
|
|
|
201dce2 |
}
|
|
|
201dce2 |
else
|
|
|
201dce2 |
! do_unlet((char_u *)"g:current_compiler", TRUE);
|
|
|
201dce2 |
}
|
|
|
201dce2 |
}
|
|
|
201dce2 |
}
|
|
|
201dce2 |
*** ../vim-7.2.336/src/version.c 2010-01-19 15:51:29.000000000 +0100
|
|
|
201dce2 |
--- src/version.c 2010-01-19 16:11:20.000000000 +0100
|
|
|
201dce2 |
***************
|
|
|
201dce2 |
*** 683,684 ****
|
|
|
201dce2 |
--- 683,686 ----
|
|
|
201dce2 |
{ /* Add new patch number below this line */
|
|
|
201dce2 |
+ /**/
|
|
|
201dce2 |
+ 337,
|
|
|
201dce2 |
/**/
|
|
|
201dce2 |
|
|
|
201dce2 |
--
|
|
|
201dce2 |
hundred-and-one symptoms of being an internet addict:
|
|
|
201dce2 |
121. You ask for e-mail adresses instead of telephone numbers.
|
|
|
201dce2 |
|
|
|
201dce2 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
201dce2 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
201dce2 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
201dce2 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|