mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-10 21:38:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

option: Add // to the end of default &directory

Browse Source
This commit is contained in:
ZyX
2015-10-17 21:46:30 +03:00
parent aadaa1fed4
commit a82a059921
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/option.c
View File

@@ -698,10 +698,11 @@ void set_init_1(void)
#endif #endif
false); false);
set_string_default("viewdir", stdpaths_user_data_subpath("view"), true); set_string_default("viewdir", stdpaths_user_data_subpath("view", 0), true);
set_string_default("backupdir", stdpaths_user_data_subpath("backup"), true); set_string_default("backupdir", stdpaths_user_data_subpath("backup", 0),
set_string_default("directory", stdpaths_user_data_subpath("swap"), true); true);
set_string_default("undodir", stdpaths_user_data_subpath("undo"), true); set_string_default("directory", stdpaths_user_data_subpath("swap", 2), true);
set_string_default("undodir", stdpaths_user_data_subpath("undo", 0), true);
// Set default for &runtimepath. All necessary expansions are performed in // Set default for &runtimepath. All necessary expansions are performed in
// this function. // this function.
set_runtimepath_default(); set_runtimepath_default();

13
src/nvim/os/stdpaths.c
View File

@@ -92,10 +92,19 @@ char *stdpaths_user_conf_subpath(const char *fname)
/// Return subpath of $XDG_DATA_HOME /// Return subpath of $XDG_DATA_HOME
/// ///
/// @param[in] fname New component of the path. /// @param[in] fname New component of the path.
/// @param[in] trailing_pathseps Amount of trailing path separators to add.
/// ///
/// @return [allocated] `$XDG_DATA_HOME/nvim/{fname}` /// @return [allocated] `$XDG_DATA_HOME/nvim/{fname}`
char *stdpaths_user_data_subpath(const char *fname) char *stdpaths_user_data_subpath(const char *fname,
const size_t trailing_pathseps)
FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL
{ {
return concat_fnames_realloc(get_xdg_home(kXDGDataHome), fname, true); char *ret = concat_fnames_realloc(get_xdg_home(kXDGDataHome), fname, true);
if (trailing_pathseps) {
const size_t len = strlen(ret);
ret = xrealloc(ret, len + trailing_pathseps + 1);
memset(ret + len, PATHSEP, trailing_pathseps);
ret[len + trailing_pathseps] = NUL;
}
return ret;
} }

2
src/nvim/shada.c
View File

@@ -1591,7 +1591,7 @@ static const char *shada_get_default_file(void)
FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_WARN_UNUSED_RESULT
{ {
if (default_shada_file == NULL) { if (default_shada_file == NULL) {
char *shada_dir = stdpaths_user_data_subpath("shada"); char *shada_dir = stdpaths_user_data_subpath("shada", 0);
default_shada_file = concat_fnames_realloc(shada_dir, "main.shada", true); default_shada_file = concat_fnames_realloc(shada_dir, "main.shada", true);
} }
return default_shada_file; return default_shada_file;