comparison src/os_unix.h @ 4863:c4d4f0fc12b9 v7.3.1178

updated for version 7.3.1178 Problem: Can't put all Vim config files together in one directory. Solution: Load ~/.vim/vimrc if ~/.vimrc does not exist. (Lech Lorens)
author Bram Moolenaar <bram@vim.org>
date Wed, 12 Jun 2013 20:35:58 +0200
parents e6d8b44065bc
children 2f99966971b0
comparison
equal deleted inserted replaced
4862:336f60904ce3 4863:c4d4f0fc12b9
292 # else 292 # else
293 # define USR_VIMRC_FILE "$HOME/.vimrc" 293 # define USR_VIMRC_FILE "$HOME/.vimrc"
294 # endif 294 # endif
295 #endif 295 #endif
296 296
297 #if !defined(USR_VIMRC_FILE2) && defined(OS2) 297
298 # define USR_VIMRC_FILE2 "$VIM/.vimrc" 298 #if !defined(USR_EXRC_FILE2)
299 #endif 299 # ifdef OS2
300 #if !defined(USR_VIMRC_FILE2) && defined(VMS) 300 # define USR_VIMRC_FILE2 "$HOME/vimfiles/vimrc"
301 # define USR_VIMRC_FILE2 "sys$login:_vimrc" 301 # else
302 # ifdef VMS
303 # define USR_VIMRC_FILE2 "sys$login:vimfiles:vimrc"
304 # else
305 # define USR_VIMRC_FILE2 "~/.vim/vimrc"
306 # endif
307 # endif
308 #endif
309
310 #if !defined(USR_VIMRC_FILE3) && defined(OS2)
311 # define USR_VIMRC_FILE3 "$VIM/.vimrc"
312 #endif
313 #if !defined(USR_VIMRC_FILE3) && defined(VMS)
314 # define USR_VIMRC_FILE3 "sys$login:_vimrc"
302 #endif 315 #endif
303 316
304 #ifndef USR_GVIMRC_FILE 317 #ifndef USR_GVIMRC_FILE
305 # ifdef VMS 318 # ifdef VMS
306 # define USR_GVIMRC_FILE "sys$login:.gvimrc" 319 # define USR_GVIMRC_FILE "sys$login:.gvimrc"
307 # else 320 # else
308 # define USR_GVIMRC_FILE "$HOME/.gvimrc" 321 # define USR_GVIMRC_FILE "$HOME/.gvimrc"
309 # endif 322 # endif
310 #endif 323 #endif
311 324
325 #ifndef USR_GVIMRC_FILE2
326 # ifdef OS2
327 # define USR_GVIMRC_FILE2 "$HOME/vimfiles/gvimrc"
328 # else
329 # ifdef VMS
330 # define USR_GVIMRC_FILE2 "sys$login:vimfiles:gvimrc"
331 # else
332 # define USR_GVIMRC_FILE2 "~/.vim/gvimrc"
333 # endif
334 # endif
335 #endif
336
312 #ifdef VMS 337 #ifdef VMS
313 # ifndef USR_GVIMRC_FILE2 338 # ifndef USR_GVIMRC_FILE3
314 # define USR_GVIMRC_FILE2 "sys$login:_gvimrc" 339 # define USR_GVIMRC_FILE3 "sys$login:_gvimrc"
315 # endif 340 # endif
316 #endif 341 #endif
317 342
318 #ifndef EVIM_FILE 343 #ifndef EVIM_FILE
319 # define EVIM_FILE "$VIMRUNTIME/evim.vim" 344 # define EVIM_FILE "$VIMRUNTIME/evim.vim"