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

1 files changed, 4 insertions, 4 deletions

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;