aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 9.1.1159: $MYVIMDIR may not always be set

Browse Source 
Problem:  $MYVIMDIR may not always be set (after 9.1.0718)
          (sandwm)
Solution: always set $MYVIMDIR to first item in runtimepath
          (except when using --clean), update it when changing &rtp

fixes: #16609
closes: #16709

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt
2025-02-28 17:34:46 +01:00
parent 5e8b2268e1
commit 3e2affc324
5 changed files with 69 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/optionstr.c
View File

@@ -135,6 +135,7 @@ static char *(p_sws_values[]) = {"fsync", "sync", NULL};
static int check_opt_strings(char_u *val, char **values, int list);
static int opt_strings_flags(char_u *val, char **values, unsigned *flagp, int list);
static void export_myvimdir(void);
/*
* After setting various option values: recompute variables that depend on
@@ -4652,10 +4653,13 @@ did_set_string_option(
setmouse(); // in case 'mouse' changed
}
#if defined(FEAT_LUA) || defined(PROTO)
if (varp == &p_rtp)
{
export_myvimdir();
#if defined(FEAT_LUA) || defined(PROTO)
update_package_paths_in_lua();
#endif
}
#if defined(FEAT_LINEBREAK)
// Changing Formatlistpattern when briopt includes the list setting:
@@ -4809,3 +4813,37 @@ restore_shm_value(void)
vim_memset(shm_buf, 0, SHM_LEN);
}
}
/*
* Export the environment variable $MYVIMDIR to the first item in runtimepath
*/
static void
export_myvimdir()
{
int dofree = FALSE;
char_u *p;
char_u *q = p_rtp;
char_u *buf = alloc(MAXPATHL);
if (buf == NULL)
return;
(void)copy_option_part(&q, buf, MAXPATHL, ",");
p = vim_getenv((char_u *)"MYVIMDIR", &dofree);
if (p == NULL || STRCMP(p, buf) != 0)
{
add_pathsep(buf);
#ifdef MSWIN
// normalize path separators
for (q = buf; *q != NUL; q++)
if (*q == '/')
*q = '\\';
#endif
vim_setenv((char_u *)"MYVIMDIR", buf);
}
if (dofree)
vim_free(p);
vim_free(buf);
}