diff options
Diffstat (limited to 'src/ex_cmds2.c')
| -rw-r--r-- | src/ex_cmds2.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index e6ef381145..e255a13d71 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -3349,6 +3349,7 @@ add_pack_plugin(char_u *fname, void *cookie) char_u *afterdir; size_t afterlen = 0; char_u *ffname = fix_fname(fname); + int fname_len; if (ffname == NULL) return; @@ -3369,7 +3370,20 @@ add_pack_plugin(char_u *fname, void *cookie) * find the part up to "pack" in 'runtimepath' */ c = *p4; *p4 = NUL; - insp = (char_u *)strstr((char *)p_rtp, (char *)ffname); + + /* Find "ffname" in "p_rtp", ignoring '/' vs '\' differences. */ + fname_len = STRLEN(ffname); + insp = p_rtp; + for (;;) + { + if (vim_fnamencmp(insp, ffname, fname_len) == 0) + break; + insp = vim_strchr(insp, ','); + if (insp == NULL) + break; + ++insp; + } + if (insp == NULL) /* not found, append at the end */ insp = p_rtp + STRLEN(p_rtp); |