patch 9.1.0362: expanding rc config files does not work well

Problem:  expanding rc config files does not work well
          (Michał Sieroń, after v9.1.0327)
Solution: initialize chartab option, required to expand
          evironment variables

fixes: #14597

Co-authored-by: author
Signed-off-by: author
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/option.c b/src/option.c
index 1bb9e29baeaf4f2ae033c231b809763bc73d6414..0cd2823851eea46dd3c32ec7ca3fa2bce64080a4 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -384,6 +384,8 @@ set_init_xdg_rtp(void)
     char_u     *xdg_rtp = NULL;
     char_u     *vimrc_xdg = NULL;
 
+    // initialize chartab, so we can expand $HOME
+    (void)init_chartab();
     vimrc1 = expand_env_save((char_u *)USR_VIMRC_FILE);
     vimrc2 = expand_env_save((char_u *)USR_VIMRC_FILE2);
 

diff --git a/src/version.c b/src/version.c
index 402ab526658dbfcec971faec44f60f79b1943d94..0dd9db066a051b526c3e6a0940df0fa7ee260add 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    362,
 /**/
     361,
 /**/