]>
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 | |
4 | @@ -3333,7 +3333,7 @@ | |
5 | if (STRCMP(name, "HOME") == 0) | |
6 | return homedir; | |
7 | #endif | |
8 | - | |
9 | +first_test: | |
10 | p = mch_getenv(name); | |
11 | if (p != NULL && *p == NUL) /* empty is the same as not set */ | |
12 | p = NULL; | |
13 | @@ -3341,6 +3341,11 @@ | |
14 | if (p != NULL) | |
15 | return p; | |
16 | ||
17 | + if (strcmp(name, "HOME_ETC") == 0) { | |
18 | + name = "HOME"; | |
19 | + goto first_test; | |
20 | + } | |
21 | + | |
22 | vimruntime = (STRCMP(name, "VIMRUNTIME") == 0); | |
23 | if (!vimruntime && STRCMP(name, "VIM") != 0) | |
24 | return NULL; | |
25 | --- vim62.orig/src/os_unix.h 2003-11-11 18:53:52.000000000 +0100 | |
26 | +++ vim62/src/os_unix.h 2003-11-11 19:53:54.000000000 +0100 | |
27 | @@ -264,7 +264,7 @@ | |
28 | # ifdef VMS | |
29 | # define USR_EXRC_FILE "sys$login:.exrc" | |
30 | # else | |
31 | -# define USR_EXRC_FILE "$HOME/.exrc" | |
32 | +# define USR_EXRC_FILE "$HOME_ETC/.exrc" | |
33 | # endif | |
34 | #endif | |
35 | ||
36 | @@ -279,7 +279,7 @@ | |
37 | # ifdef VMS | |
38 | # define USR_VIMRC_FILE "sys$login:.vimrc" | |
39 | # else | |
40 | -# define USR_VIMRC_FILE "$HOME/.vimrc" | |
41 | +# define USR_VIMRC_FILE "$HOME_ETC/.vimrc" | |
42 | # endif | |
43 | #endif | |
44 | ||
45 | @@ -294,7 +294,7 @@ | |
46 | # ifdef VMS | |
47 | # define USR_GVIMRC_FILE "sys$login:.gvimrc" | |
48 | # else | |
49 | -# define USR_GVIMRC_FILE "$HOME/.gvimrc" | |
50 | +# define USR_GVIMRC_FILE "$HOME_ETC/.gvimrc" | |
51 | # endif | |
52 | #endif | |
53 | ||
54 | @@ -313,7 +313,7 @@ | |
55 | # ifdef VMS | |
56 | # define VIMINFO_FILE "sys$login:.viminfo" | |
57 | # else | |
58 | -# define VIMINFO_FILE "$HOME/.viminfo" | |
59 | +# define VIMINFO_FILE "$HOME_ETC/.viminfo" | |
60 | # endif | |
61 | # endif | |
62 | # if !defined(VIMINFO_FILE2) && defined(OS2) | |
63 | @@ -373,7 +373,7 @@ | |
64 | # ifdef VMS | |
65 | # define DFLT_VDIR "sys$login:vimfiles/view" | |
66 | # else | |
67 | -# define DFLT_VDIR "$HOME/.vim/view" /* default for 'viewdir' */ | |
68 | +# define DFLT_VDIR "$HOME_ETC/.vim/view" /* default for 'viewdir' */ | |
69 | # endif | |
70 | # endif | |
71 | #endif | |
72 | @@ -387,9 +387,9 @@ | |
73 | # define DFLT_RUNTIMEPATH "sys$login:vimfiles,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,sys$login:vimfiles/after" | |
74 | # else | |
75 | # ifdef RUNTIME_GLOBAL | |
76 | -# define DFLT_RUNTIMEPATH "~/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after,~/.vim/after" | |
77 | +# define DFLT_RUNTIMEPATH "$HOME_ETC/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after,$HOME_ETC/.vim/after" | |
78 | # else | |
79 | -# define DFLT_RUNTIMEPATH "~/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,~/.vim/after" | |
80 | +# define DFLT_RUNTIMEPATH "$HOME_ETC/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,$HOME_ETC/.vim/after" | |
81 | # endif | |
82 | # endif | |
83 | #endif |