From c2dd07448ff1b2922e8ea14f909a9cbde481e5fc Mon Sep 17 00:00:00 2001 From: Keerthan Jaic Date: Tue, 4 Aug 2015 21:41:38 -0400 Subject: option,main: Partial support of XDG base directory specification - Add functions that are able to query XDG. - Replace defaults for - &runtimepath. Does not follow #78. - &viewdir. - &undodir. - &directory. - &backupdir. Does not follow #78. - vimrc location. - Remove user vimrc file line from :version message. --- src/nvim/os/unix_defs.h | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'src/nvim/os/unix_defs.h') diff --git a/src/nvim/os/unix_defs.h b/src/nvim/os/unix_defs.h index 949973bf40..83c6752ff7 100644 --- a/src/nvim/os/unix_defs.h +++ b/src/nvim/os/unix_defs.h @@ -31,12 +31,6 @@ #ifndef USR_EXRC_FILE # define USR_EXRC_FILE "~/.exrc" #endif -#ifndef USR_VIMRC_FILE -# define USR_VIMRC_FILE "~/.nvimrc" -#endif -#ifndef USR_VIMRC_FILE2 -# define USR_VIMRC_FILE2 "~/.nvim/nvimrc" -#endif #ifndef EXRC_FILE # define EXRC_FILE ".exrc" #endif @@ -47,27 +41,4 @@ # define SHADA_FILE "~/.nvim/shada/main.shada" #endif -// Default for 'backupdir'. -#ifndef DFLT_BDIR -# define DFLT_BDIR ".,~/tmp,~/" -#endif - -// Default for 'directory'. -#ifndef DFLT_DIR -# define DFLT_DIR ".,~/tmp,/var/tmp,/tmp" -#endif - -// Default for 'viewdir'. -#ifndef DFLT_VDIR -# define DFLT_VDIR "~/.nvim/view" -#endif - -#ifdef RUNTIME_GLOBAL -# define DFLT_RUNTIMEPATH "~/.nvim," RUNTIME_GLOBAL ",$VIMRUNTIME," \ - RUNTIME_GLOBAL "/after,~/.nvim/after" -#else -# define DFLT_RUNTIMEPATH \ - "~/.nvim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,~/.nvim/after" -#endif - #endif // NVIM_OS_UNIX_DEFS_H -- cgit From 2e750973e936a04d9effea88f78f03a5a07ab282 Mon Sep 17 00:00:00 2001 From: ZyX Date: Sat, 17 Oct 2015 15:41:05 +0300 Subject: shada: Move shada file to a new location --- src/nvim/os/unix_defs.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/nvim/os/unix_defs.h') diff --git a/src/nvim/os/unix_defs.h b/src/nvim/os/unix_defs.h index 83c6752ff7..82a434cdf1 100644 --- a/src/nvim/os/unix_defs.h +++ b/src/nvim/os/unix_defs.h @@ -37,8 +37,5 @@ #ifndef VIMRC_FILE # define VIMRC_FILE ".nvimrc" #endif -#ifndef SHADA_FILE -# define SHADA_FILE "~/.nvim/shada/main.shada" -#endif #endif // NVIM_OS_UNIX_DEFS_H -- cgit From afcc842881d2569c11da26a75057062ba4f124e7 Mon Sep 17 00:00:00 2001 From: ZyX Date: Sat, 17 Oct 2015 21:53:16 +0300 Subject: main,version: Remove USR_EXRC_FILE* --- src/nvim/os/unix_defs.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/nvim/os/unix_defs.h') diff --git a/src/nvim/os/unix_defs.h b/src/nvim/os/unix_defs.h index 82a434cdf1..e1c3060999 100644 --- a/src/nvim/os/unix_defs.h +++ b/src/nvim/os/unix_defs.h @@ -28,9 +28,6 @@ #ifndef SYNTAX_FNAME # define SYNTAX_FNAME "$VIMRUNTIME/syntax/%s.vim" #endif -#ifndef USR_EXRC_FILE -# define USR_EXRC_FILE "~/.exrc" -#endif #ifndef EXRC_FILE # define EXRC_FILE ".exrc" #endif -- cgit From 157af47202c41b3d987d45be3542e74456f06470 Mon Sep 17 00:00:00 2001 From: ZyX Date: Fri, 23 Oct 2015 17:45:59 +0300 Subject: os/unix_defs: Rename default system vimrc file to sysinit.vim This way all standard Vim file paths have .vim extension. VIMRC_FILE constant used for &exrc option was not touched. --- src/nvim/os/unix_defs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/os/unix_defs.h') diff --git a/src/nvim/os/unix_defs.h b/src/nvim/os/unix_defs.h index e1c3060999..b1511d4b56 100644 --- a/src/nvim/os/unix_defs.h +++ b/src/nvim/os/unix_defs.h @@ -20,7 +20,7 @@ // Unix system-dependent file names #ifndef SYS_VIMRC_FILE -# define SYS_VIMRC_FILE "$VIM/nvimrc" +# define SYS_VIMRC_FILE "$VIM/sysinit.vim" #endif #ifndef DFLT_HELPFILE # define DFLT_HELPFILE "$VIMRUNTIME/doc/help.txt" -- cgit