mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-01 14:33:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

os_unix_defs && os/unix_defs: Consistently use '~' over '$HOME' #2009

Browse Source 
these path names are ridiculous...

Based on #889, but also remove some unused #defines
This commit is contained in:
Michael Reed
2015-02-17 01:18:22 -05:00
committed by Justin M. Keyes
parent 1e6c487488
commit 032c20078a
2 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/os/unix_defs.h
View File

@@ -1,7 +1,7 @@
#ifndef NVIM_OS_UNIX_DEFS_H #ifndef NVIM_OS_UNIX_DEFS_H
#define NVIM_OS_UNIX_DEFS_H #define NVIM_OS_UNIX_DEFS_H
#define TEMP_DIR_NAMES {"$TMPDIR", "/tmp", ".", "$HOME"} #define TEMP_DIR_NAMES {"$TMPDIR", "/tmp", ".", "~"}
#define TEMP_FILE_PATH_MAXLEN 256 #define TEMP_FILE_PATH_MAXLEN 256
#endif // NVIM_OS_UNIX_DEFS_H #endif // NVIM_OS_UNIX_DEFS_H

21
src/nvim/os_unix_defs.h
View File

@@ -101,9 +101,6 @@
#ifndef SYS_VIMRC_FILE #ifndef SYS_VIMRC_FILE
# define SYS_VIMRC_FILE "$VIM/nvimrc" # define SYS_VIMRC_FILE "$VIM/nvimrc"
#endif #endif
#ifndef SYS_GVIMRC_FILE
# define SYS_GVIMRC_FILE "$VIM/ngvimrc"
#endif
#ifndef DFLT_HELPFILE #ifndef DFLT_HELPFILE
# define DFLT_HELPFILE "$VIMRUNTIME/doc/help.txt" # define DFLT_HELPFILE "$VIMRUNTIME/doc/help.txt"
#endif #endif
@@ -130,12 +127,12 @@
#endif #endif
#ifndef USR_EXRC_FILE #ifndef USR_EXRC_FILE
# define USR_EXRC_FILE "$HOME/.exrc" # define USR_EXRC_FILE "~/.exrc"
#endif #endif
#ifndef USR_VIMRC_FILE #ifndef USR_VIMRC_FILE
# define USR_VIMRC_FILE "$HOME/.nvimrc" # define USR_VIMRC_FILE "~/.nvimrc"
#endif #endif
@@ -143,18 +140,8 @@
# define USR_VIMRC_FILE2 "~/.nvim/nvimrc" # define USR_VIMRC_FILE2 "~/.nvim/nvimrc"
#endif #endif
#ifndef USR_GVIMRC_FILE
# define USR_GVIMRC_FILE "$HOME/.ngvimrc"
#endif
#ifndef USR_GVIMRC_FILE2
# define USR_GVIMRC_FILE2 "~/.nvim/ngvimrc"
#endif
# ifndef VIMINFO_FILE # ifndef VIMINFO_FILE
# define VIMINFO_FILE "$HOME/.nviminfo" # define VIMINFO_FILE "~/.nviminfo"
# endif # endif
#ifndef EXRC_FILE #ifndef EXRC_FILE
@@ -179,7 +166,7 @@
#endif #endif
#ifndef DFLT_VDIR #ifndef DFLT_VDIR
# define DFLT_VDIR "$HOME/.nvim/view" /* default for 'viewdir' */ # define DFLT_VDIR "~/.nvim/view" // default for 'viewdir'
#endif #endif
#define DFLT_ERRORFILE "errors.err" #define DFLT_ERRORFILE "errors.err"