diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-03-03 15:47:06 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-03-03 15:47:06 +0100 |
| commit | 863c1a9079fa340d663ccafb011729a29186d73e (patch) | |
| tree | 892a28e0594ec0be6b9499b71e3f78ba227333f6 /src/ex_cmds2.c | |
| parent | 1bdd42627d619258d0e847f217cfc1c2795f1ac5 (diff) | |
patch 7.4.1479v7.4.1479
Problem: No testfor ":loadplugin".
Solution: Add a test. Fix how option is being set.
Diffstat (limited to 'src/ex_cmds2.c')
| -rw-r--r-- | src/ex_cmds2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index 3768569397..52575bf0a5 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -3058,14 +3058,14 @@ do_in_runtimepath( static void may_do_filetypes(char_u *pat) { - char_u *cmd = vim_strsave((char_u *)"did_load_filetypes"); + char_u *cmd = vim_strsave((char_u *)"g:did_load_filetypes"); /* If runtime/filetype.vim wasn't loaded yet, the scripts will be found * when it loads. */ if (cmd != NULL && eval_to_number(cmd) > 0) { do_cmdline_cmd((char_u *)"augroup filetypedetect"); - source_runtime(pat, TRUE); + do_in_path(p_pp, pat, TRUE, source_callback, NULL); do_cmdline_cmd((char_u *)"augroup END"); } vim_free(cmd); @@ -3125,8 +3125,8 @@ source_pack_plugin(char_u *fname, void *cookie UNUSED) if (p_rtp[keep] != NUL) mch_memmove(new_rtp + keep + 1 + addlen, p_rtp + keep, oldlen - keep + 1); - free_string_option(p_rtp); - p_rtp = new_rtp; + set_option_value((char_u *)"rtp", 0L, new_rtp, 0); + vim_free(new_rtp); } *p2 = c; |