From d43ac790f2454e2173eb645bdcd97c7a7c7e4846 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Thu, 28 Apr 2016 19:23:15 -0400 Subject: vim-patch:7.4.1479 Problem: No testfor ":loadplugin". Solution: Add a test. Fix how option is being set. https://github.com/vim/vim/commit/863c1a9079fa340d663ccafb011729a29186d73e --- src/nvim/ex_cmds2.c | 8 ++++---- src/nvim/version.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index 8389ed9400..bafd4ee666 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -2378,13 +2378,13 @@ int do_in_runtimepath(char_u *name, bool all, DoInRuntimepathCB callback, // Source filetype detection scripts, if filetype.vim was already done. 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("augroup filetypedetect"); - source_runtime(pat, TRUE); + do_in_path(p_pp, pat, true, source_callback, NULL); do_cmdline_cmd("augroup END"); } xfree(cmd); @@ -2438,8 +2438,8 @@ static void source_pack_plugin(char_u *fname, void *cookie) 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); + xfree(new_rtp); } *p2 = c; diff --git a/src/nvim/version.c b/src/nvim/version.c index 896bf47a53..da717b9319 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -216,7 +216,7 @@ static int included_patches[] = { // 1482 NA // 1481 NA // 1480, - // 1479, + 1479, 1478, // 1477, // 1476 NA -- cgit