# endif
# endif
# if !defined(VIMINFO_FILE2) && defined(OS2)
-@@ -373,7 +373,7 @@
- # 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
+@@ -362,7 +362,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
+
@@ -387,9 +387,9 @@
- # define DFLT_RUNTIMEPATH "sys$login:vimfiles,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,sys$login:vimfiles/after"
+ # define DFLT_RUNTIMEPATH "sys$login:vimfiles,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,sys$login:vimfiles/after"
+ #else
+ # ifdef RUNTIME_GLOBAL
+-# define DFLT_RUNTIMEPATH "~/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after,~/.vim/after"
++# define DFLT_RUNTIMEPATH "$HOME_ETC/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after,$HOME_ETC/.vim/after"
# else
- # ifdef RUNTIME_GLOBAL
--# define DFLT_RUNTIMEPATH "~/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after,~/.vim/after"
-+# define DFLT_RUNTIMEPATH "$HOME_ETC/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after,$HOME_ETC/.vim/after"
- # else
--# define DFLT_RUNTIMEPATH "~/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,~/.vim/after"
-+# define DFLT_RUNTIMEPATH "$HOME_ETC/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,$HOME_ETC/.vim/after"
- # endif
+-# define DFLT_RUNTIMEPATH "~/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,~/.vim/after"
++# define DFLT_RUNTIMEPATH "$HOME_ETC/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,$HOME_ETC/.vim/after"
# endif
#endif
+
+ #ifndef VMS