patch 9.1.1894: global_runtime_dir appends /after directory when using XDG
Commit:
https://github.com/vim/vim/commit/7c418c75a404b7cc9d3380b63b6faf3a281a9440
Author: Christian Brabandt <[email protected]>
Date: Sat Nov 1 16:20:10 2025 +0000
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 <[email protected]>
diff --git a/src/os_haiku.h b/src/os_haiku.h
index c9ce8fcf4..cd6feb2c1 100644
--- 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 145a404e0..2125ae7ba 100644
--- 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 e6dd363c5..b8a4d78a8 100644
--- 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,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1vGllh-006kMj-MD%40256bit.org.
