patch 9.1.1894: global_runtime_dir appends /after directory when using XDG

Problem:  global_runtime_dir appends /after directory when using XDG
          configuration directory (Marius Gedminas).
Solution: Do not append /after to RUNTIME_GLOBAL_AFTER.

closes: #18663
closes: #18665

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

diff --git a/src/os_haiku.h b/src/os_haiku.h
index c9ce8fcf4f28d44f02976a74759a1800b8eb4f3a..cd6feb2c1626472fefa651e51d684ba6a2892084 100644 (file)
--- a/src/os_haiku.h
+++ b/src/os_haiku.h
@@ -26,8 +26,8 @@
 #ifdef RUNTIME_GLOBAL
 # ifdef RUNTIME_GLOBAL_AFTER
 #  define DFLT_RUNTIMEPATH     USR_VIM_DIR "," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER "," USR_VIM_DIR "/after"
-#  define XDG_RUNTIMEPATH      "$XDG_CONFIG_HOME/vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER "/after,$XDG_CONFIG_HOME/vim/after"
-#  define XDG_RUNTIMEPATH_FB   "~/config/settings/vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER "/after,~/config/settings/vim/after"
+#  define XDG_RUNTIMEPATH      "$XDG_CONFIG_HOME/vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER ",$XDG_CONFIG_HOME/vim/after"
+#  define XDG_RUNTIMEPATH_FB   "~/config/settings/vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER ",~/config/settings/vim/after"
 #  define CLEAN_RUNTIMEPATH    RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER
 # else
 #  define DFLT_RUNTIMEPATH     USR_VIM_DIR "," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after," USR_VIM_DIR "/after"

diff --git a/src/os_unix.h b/src/os_unix.h
index 145a404e03edce5c3f20aa4c7b741153de4152c9..2125ae7bad76322d53ebec066c6b0700fe94f8a5 100644 (file)
--- a/src/os_unix.h
+++ b/src/os_unix.h
@@ -359,8 +359,8 @@ typedef struct dsc$descriptor   DESC;
 #  ifdef RUNTIME_GLOBAL
 #   ifdef RUNTIME_GLOBAL_AFTER
 #    define DFLT_RUNTIMEPATH   "~/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER ",~/.vim/after"
-#    define XDG_RUNTIMEPATH    "$XDG_CONFIG_HOME/vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER "/after,$XDG_CONFIG_HOME/vim/after"
-#    define XDG_RUNTIMEPATH_FB "~/.config/vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER "/after,~/.config/vim/after"
+#    define XDG_RUNTIMEPATH    "$XDG_CONFIG_HOME/vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER ",$XDG_CONFIG_HOME/vim/after"
+#    define XDG_RUNTIMEPATH_FB "~/.config/vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER ",~/.config/vim/after"
 #    define CLEAN_RUNTIMEPATH  RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER
 #   else
 #    define DFLT_RUNTIMEPATH   "~/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after,~/.vim/after"

diff --git a/src/version.c b/src/version.c
index e6dd363c53c759cdfa41039a9710aa3ba878f87b..b8a4d78a84bc47557ae9cc6627607175ab8dbcdc 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1894,
 /**/
     1893,
 /**/