patch 9.1.1153: build error on Haiku

Problem:  build error on Haiku
Solution: define XDG_RUNTIME_PATH variables
          (Begasus)

closes: #16737

Signed-off-by: Begasus <begasus@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/os_haiku.h b/src/os_haiku.h
index 1977cc1468f0c0cc074a211f02ffe5ae9011c11f..c9ce8fcf4f28d44f02976a74759a1800b8eb4f3a 100644 (file)
--- a/src/os_haiku.h
+++ b/src/os_haiku.h
@@ -26,12 +26,18 @@
 #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 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"
+#  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"
 # endif
 #else
 # define DFLT_RUNTIMEPATH      USR_VIM_DIR ",$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after," USR_VIM_DIR "/after"
+# define XDG_RUNTIMEPATH       "$XDG_CONFIG_HOME/vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,$XDG_CONFIG_HOME/vim/after"
+# define XDG_RUNTIMEPATH_FB    "~/config/settings/vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,~/config/settings/vim/after"
 # define CLEAN_RUNTIMEPATH     "$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after"
 #endif

diff --git a/src/version.c b/src/version.c
index b4c50feae2602a76968f8a112da81d149fdaaca9..2d2188a87d9fa652a41d03ff5fd816c5a529f8fa 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 */
+/**/
+    1153,
 /**/
     1152,
 /**/