vim-home_etc.patch

   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 @@ -1660,6 +1660,7 @@ vim_getenv(char_u *name, int *mustfree)
   5         return p;
   6      }
   7  #else
   8 +first_test:
   9      p = mch_getenv(name);
  10      if (p != NULL && *p == NUL)            // empty is the same as not set
  11         p = NULL;
  12 @@ -1667,6 +1668,11 @@ vim_getenv(char_u *name, int *mustfree)
  13      if (p != NULL)
  14         return p;
  15
  16 +    if (strcmp(name, "HOME_ETC") == 0) {
  17 +       name = "HOME";
  18 +       goto first_test;
  19 +    }
  20 +
  21  # ifdef __HAIKU__
  22      // special handling for user settings directory...
  23      if (STRCMP(name, "BE_USER_SETTINGS") == 0)
  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)
  62 @@ -358,7 +358,7 @@ typedef struct dsc$descriptor   DESC;
  63  # ifdef VMS
  64  #  define DFLT_VDIR    "sys$login:vimfiles/view"
  65  # else
  66 -#  define DFLT_VDIR    "$HOME/.vim/view"       // default for 'viewdir'
  67 +#  define DFLT_VDIR    "$HOME_ETC/.vim/view"       // default for 'viewdir'
  68  # endif
  69  #endif
  70
  71 @@ -371,14 +371,14 @@
  72  #  ifdef RUNTIME_GLOBAL
  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
  82  #  else
  83  #   define DFLT_RUNTIMEPATH    "~/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,~/.vim/after"
  84 -#   define CLEAN_RUNTIMEPATH   "$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after"
  85 +#   define CLEAN_RUNTIMEPATH   "$HOME_ETC/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after"
  86  #  endif
  87  # endif
  88