some dot-resources are moved under $BE_USER_STTINGS_DIRECTORY.

Fixes #443.
This commit is contained in:
Siarzhuk Zharski
2011-05-20 20:35:30 +00:00
parent 81bda76b65
commit cc9544e9a7

View File

@@ -5329,19 +5329,27 @@ diff -Naur vim73/src/os_beos.c vim73.haiku/src/os_beos.c
diff -Naur vim73/src/os_beos.h vim73.haiku/src/os_beos.h
--- vim73/src/os_beos.h 2010-05-15 11:04:11.065273856 +0000
+++ vim73.haiku/src/os_beos.h 2010-08-20 23:16:40.791937024 +0000
@@ -20,6 +20,11 @@
@@ -20,6 +20,18 @@
#undef BEOS_DR8
#define BEOS_PR_OR_BETTER
+#define USR_VIMRC_FILE "$BE_USER_SETTINGS/vim/vimrc"
+#define USR_GVIMRC_FILE "$BE_USER_SETTINGS/vim/gvimrc"
-/* select emulation */
+#define USR_VIM_DIR "$BE_USER_SETTINGS/vim"
+
+#define VIMINFO_FILE "$BE_USER_SETTINGS/vim/viminfo"
+#define USR_EXRC_FILE USR_VIM_DIR "/exrc"
+#define USR_VIMRC_FILE USR_VIM_DIR "/vimrc"
+#define USR_GVIMRC_FILE USR_VIM_DIR "/gvimrc"
+#define VIMINFO_FILE USR_VIM_DIR "/viminfo"
+
/* select emulation */
+#ifdef RUNTIME_GLOBAL
+# define DFLT_RUNTIMEPATH USR_VIM_DIR "/vimfiles," RUNTIME_GLOBAL \
+ ",$VIMRUNTIME," RUNTIME_GLOBAL "/after," USR_VIM_DIR "/vimfiles/after"
+#else
+# define DFLT_RUNTIMEPATH USR_VIM_DIR "/vimfiles," "$VIM/vimfiles" \
+ ",$VIMRUNTIME," "$VIM/vimfiles/after," USR_VIM_DIR "/vimfiles/after"
+#endif
-#include <net/socket.h> /* for typedefs and #defines only */
+//#include <net/socket.h> /* for typedefs and #defines only */
diff -Naur vim73/src/os_beos.rdef vim73.haiku/src/os_beos.rdef
--- vim73/src/os_beos.rdef 1970-01-01 00:00:00.000000000 +0000
+++ vim73.haiku/src/os_beos.rdef 2010-05-02 14:29:42.040894464 +0000
@@ -5603,6 +5611,27 @@ diff -Naur vim73/src/os_unix.c vim73.haiku/src/os_unix.c
beos_cleanup_read_thread();
# endif
diff -Naur vim73/src/os_unix.h vim73.haiku/src/os_unix.h
--- vim73/src/os_unix.h 2010-05-23 14:16:14.034865152 +0200
+++ vim73.haiku/src/os_unix.h 2011-02-21 23:18:13.038797312 +0100
@@ -388,6 +388,8 @@
#define DFLT_ERRORFILE "errors.err"
+#ifndef DFLT_RUNTIMEPATH
+
#ifdef OS2
# define DFLT_RUNTIMEPATH "$HOME/vimfiles,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,$HOME/vimfiles/after"
#else
@@ -402,6 +404,8 @@
# endif
#endif
+#endif
+
#ifdef OS2
/*
* Try several directories to put the temp files.
diff -Naur vim73/src/proto/gui_beos.pro vim73.haiku/src/proto/gui_beos.pro
--- vim73/src/proto/gui_beos.pro 1970-01-01 00:00:00.000000000 +0000
+++ vim73.haiku/src/proto/gui_beos.pro 2010-08-20 23:42:00.825229312 +0000