thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.2.337

Browse Source 
Problem:    The :compiler command doesn't function properly when invoked in a
            function.
Solution:   Add "g:" before "current_compiler". (Yukihiro Nakadaira)
This commit is contained in:
Bram Moolenaar
2010-01-19 16:13:50 +01:00
parent 7e506b6a42
commit 3d63e3f160
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ex_cmds2.c
View File

@@ -2496,14 +2496,15 @@ ex_compiler(eap)
* To remain backwards compatible "current_compiler" is always * To remain backwards compatible "current_compiler" is always
* used. A user's compiler plugin may set it, the distributed * used. A user's compiler plugin may set it, the distributed
* plugin will then skip the settings. Afterwards set * plugin will then skip the settings. Afterwards set
* "b:current_compiler" and restore "current_compiler". */ * "b:current_compiler" and restore "current_compiler".
old_cur_comp = get_var_value((char_u *)"current_compiler"); * Explicitly prepend "g:" to make it work in a function. */
old_cur_comp = get_var_value((char_u *)"g:current_compiler");
if (old_cur_comp != NULL) if (old_cur_comp != NULL)
old_cur_comp = vim_strsave(old_cur_comp); old_cur_comp = vim_strsave(old_cur_comp);
do_cmdline_cmd((char_u *) do_cmdline_cmd((char_u *)
"command -nargs=* CompilerSet setlocal <args>"); "command -nargs=* CompilerSet setlocal <args>");
} }
do_unlet((char_u *)"current_compiler", TRUE); do_unlet((char_u *)"g:current_compiler", TRUE);
do_unlet((char_u *)"b:current_compiler", TRUE); do_unlet((char_u *)"b:current_compiler", TRUE);
sprintf((char *)buf, "compiler/%s.vim", eap->arg); sprintf((char *)buf, "compiler/%s.vim", eap->arg);
@@ -2514,7 +2515,7 @@ ex_compiler(eap)
do_cmdline_cmd((char_u *)":delcommand CompilerSet"); do_cmdline_cmd((char_u *)":delcommand CompilerSet");
/* Set "b:current_compiler" from "current_compiler". */ /* Set "b:current_compiler" from "current_compiler". */
p = get_var_value((char_u *)"current_compiler"); p = get_var_value((char_u *)"g:current_compiler");
if (p != NULL) if (p != NULL)
set_internal_string_var((char_u *)"b:current_compiler", p); set_internal_string_var((char_u *)"b:current_compiler", p);
@@ -2523,12 +2524,12 @@ ex_compiler(eap)
{ {
if (old_cur_comp != NULL) if (old_cur_comp != NULL)
{ {
set_internal_string_var((char_u *)"current_compiler", set_internal_string_var((char_u *)"g:current_compiler",
old_cur_comp); old_cur_comp);
vim_free(old_cur_comp); vim_free(old_cur_comp);
} }
else else
do_unlet((char_u *)"current_compiler", TRUE); do_unlet((char_u *)"g:current_compiler", TRUE);
} }
} }
} }

2
src/version.c
View File

@@ -681,6 +681,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
337,
/**/ /**/
336, 336,
/**/ /**/