[packages/vim.git] / vim-home_etc.patch

diff -Nru vim62.orig/src/misc1.c vim62/src/misc1.c
--- vim62.orig/src/misc1.c	2003-11-11 18:53:52.000000000 +0100
+++ vim62/src/misc1.c	2003-11-11 19:29:32.000000000 +0100
@@ -2220,12 +2220,19 @@
 	return p;
     }
 #else
+first_test:
     p = mch_getenv(name);
     if (p != NULL && *p == NUL)	    // empty is the same as not set
 	p = NULL;
 
     if (p != NULL)
 	return p;
+
+    if (strcmp(name, "HOME_ETC") == 0) {
+	name = "HOME";
+	goto first_test;
+    }
+
 #endif
 
     // handling $VIMRUNTIME and $VIM is below, bail out if it's another name.
--- vim62.orig/src/os_unix.h	2003-11-11 18:53:52.000000000 +0100
+++ vim62/src/os_unix.h	2003-11-11 19:53:54.000000000 +0100
@@ -264,7 +264,7 @@
 # ifdef VMS
 #  define USR_EXRC_FILE "sys$login:.exrc"
 # else
-#  define USR_EXRC_FILE "$HOME/.exrc"
+#  define USR_EXRC_FILE "$HOME_ETC/.exrc"
 # endif
 #endif
 
@@ -279,7 +279,7 @@
 # ifdef VMS
 # define USR_VIMRC_FILE  "sys$login:.vimrc"
 # else
-#  define USR_VIMRC_FILE "$HOME/.vimrc"
+#  define USR_VIMRC_FILE "$HOME_ETC/.vimrc"
 # endif
 #endif
 
@@ -294,7 +294,7 @@
 # ifdef VMS
 #  define USR_GVIMRC_FILE "sys$login:.gvimrc"
 # else
-#  define USR_GVIMRC_FILE "$HOME/.gvimrc"
+#  define USR_GVIMRC_FILE "$HOME_ETC/.gvimrc"
 # endif
 #endif
 
@@ -313,7 +313,7 @@
 #  ifdef VMS
 #   define VIMINFO_FILE  "sys$login:.viminfo"
 #  else
-#   define VIMINFO_FILE "$HOME/.viminfo"
+#   define VIMINFO_FILE "$HOME_ETC/.viminfo"
 #  endif
 # endif
 # if !defined(VIMINFO_FILE2) && defined(OS2)
@@ -358,7 +358,7 @@ typedef struct dsc$descriptor   DESC;
 # ifdef VMS
 #  define DFLT_VDIR    "sys$login:vimfiles/view"
 # else
-#  define DFLT_VDIR    "$HOME/.vim/view"       // default for 'viewdir'
+#  define DFLT_VDIR    "$HOME_ETC/.vim/view"       // default for 'viewdir'
 # endif
 #endif
 
@@ -371,14 +371,14 @@
 # ifdef RUNTIME_GLOBAL
 #  ifdef RUNTIME_GLOBAL_AFTER
 #   define DFLT_RUNTIMEPATH	"~/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER ",~/.vim/after"
-#   define CLEAN_RUNTIMEPATH	RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER
+#   define CLEAN_RUNTIMEPATH	"$HOME_ETC/.vim/after," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER
 #  else
 #   define DFLT_RUNTIMEPATH	"~/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after,~/.vim/after"
-#   define CLEAN_RUNTIMEPATH	RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after"
+#   define CLEAN_RUNTIMEPATH	"$HOME_ETC/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after"
 #  endif
 # else
 #  define DFLT_RUNTIMEPATH	"~/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,~/.vim/after"
-#  define CLEAN_RUNTIMEPATH	"$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after"
+#  define CLEAN_RUNTIMEPATH	"$HOME_ETC/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after"
 # endif
 #endif
Commit	Line	Data
bea64654	1	diff -Nru vim62.orig/src/misc1.c vim62/src/misc1.c
	2	--- vim62.orig/src/misc1.c 2003-11-11 18:53:52.000000000 +0100
	3	+++ vim62/src/misc1.c 2003-11-11 19:29:32.000000000 +0100
326cec69 AG	4	@@ -2220,12 +2220,19 @@
	5	return p;
	6	}
	7	#else
bea64654	8	+first_test:
bea64654	9	p = mch_getenv(name);
326cec69	10	if (p != NULL && *p == NUL) // empty is the same as not set
bea64654	11	p = NULL;
326cec69	12
bea64654	13	if (p != NULL)
bea64654	14	return p;
326cec69	15	+
bea64654	16	+ if (strcmp(name, "HOME_ETC") == 0) {
326cec69 AG	17	+ name = "HOME";
326cec69 AG	18	+ goto first_test;
bea64654	19	+ }
bea64654	20	+
326cec69 AG	21	#endif
	22
	23	// handling $VIMRUNTIME and $VIM is below, bail out if it's another name.
bea64654	24	--- vim62.orig/src/os_unix.h 2003-11-11 18:53:52.000000000 +0100
	25	+++ vim62/src/os_unix.h 2003-11-11 19:53:54.000000000 +0100
	26	@@ -264,7 +264,7 @@
	27	# ifdef VMS
	28	# define USR_EXRC_FILE "sys$login:.exrc"
	29	# else
	30	-# define USR_EXRC_FILE "$HOME/.exrc"
	31	+# define USR_EXRC_FILE "$HOME_ETC/.exrc"
	32	# endif
	33	#endif
	34
	35	@@ -279,7 +279,7 @@
	36	# ifdef VMS
	37	# define USR_VIMRC_FILE "sys$login:.vimrc"
	38	# else
	39	-# define USR_VIMRC_FILE "$HOME/.vimrc"
	40	+# define USR_VIMRC_FILE "$HOME_ETC/.vimrc"
	41	# endif
	42	#endif
	43
	44	@@ -294,7 +294,7 @@
	45	# ifdef VMS
	46	# define USR_GVIMRC_FILE "sys$login:.gvimrc"
	47	# else
	48	-# define USR_GVIMRC_FILE "$HOME/.gvimrc"
	49	+# define USR_GVIMRC_FILE "$HOME_ETC/.gvimrc"
	50	# endif
	51	#endif
	52
	53	@@ -313,7 +313,7 @@
	54	# ifdef VMS
	55	# define VIMINFO_FILE "sys$login:.viminfo"
	56	# else
	57	-# define VIMINFO_FILE "$HOME/.viminfo"
	58	+# define VIMINFO_FILE "$HOME_ETC/.viminfo"
	59	# endif
	60	# endif
	61	# if !defined(VIMINFO_FILE2) && defined(OS2)
367e4073	62	@@ -358,7 +358,7 @@ typedef struct dsc$descriptor DESC;
4ca24e06 AM	63	# ifdef VMS
	64	# define DFLT_VDIR "sys$login:vimfiles/view"
	65	# else
367e4073 AM	66	-# define DFLT_VDIR "$HOME/.vim/view" // default for 'viewdir'
367e4073 AM	67	+# define DFLT_VDIR "$HOME_ETC/.vim/view" // default for 'viewdir'
bea64654	68	# endif
bea64654	69	#endif
4ca24e06	70
78a8f814	71	@@ -371,14 +371,14 @@
4ca24e06	72	# ifdef RUNTIME_GLOBAL
78a8f814 AG	73	# ifdef RUNTIME_GLOBAL_AFTER
	74	# define DFLT_RUNTIMEPATH "~/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER ",~/.vim/after"
	75	-# define CLEAN_RUNTIMEPATH RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER
	76	+# define CLEAN_RUNTIMEPATH "$HOME_ETC/.vim/after," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER
	77	# else
	78	# define DFLT_RUNTIMEPATH "~/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after,~/.vim/after"
	79	-# define CLEAN_RUNTIMEPATH RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after"
	80	+# define CLEAN_RUNTIMEPATH "$HOME_ETC/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after"
	81	# endif
bea64654	82	# else
8c2513ef AM	83	# define DFLT_RUNTIMEPATH "~/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,~/.vim/after"
8c2513ef AM	84	-# define CLEAN_RUNTIMEPATH "$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after"
78a8f814	85	+# define CLEAN_RUNTIMEPATH "$HOME_ETC/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after"
bea64654	86	# endif
bea64654	87	#endif
4ca24e06	88