aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSeth Jackson <sethjackson@gmail.com>2016-01-13 21:08:32 -0500
committerSeth Jackson <sethjackson@gmail.com>2016-01-14 13:13:32 -0500
commit62d137ce09692e7c85a489fce6ae07a7c7ad004c (patch)
treeec525228cc6065c2b3daa223f9ae6d99e1376dff /src
parentbf7bc4dcf0023eb493c0b1d7860e72f3dcd04d78 (diff)
downloadrneovim-62d137ce09692e7c85a489fce6ae07a7c7ad004c.tar.gz
rneovim-62d137ce09692e7c85a489fce6ae07a7c7ad004c.tar.bz2
rneovim-62d137ce09692e7c85a489fce6ae07a7c7ad004c.zip
Remove swapsync.
It's complete overkill.
Diffstat (limited to 'src')
-rw-r--r--src/nvim/memfile.c8
-rw-r--r--src/nvim/option_defs.h41
-rw-r--r--src/nvim/options.lua7
3 files changed, 23 insertions, 33 deletions
diff --git a/src/nvim/memfile.c b/src/nvim/memfile.c
index 9f5e4247b5..137c7c49d3 100644
--- a/src/nvim/memfile.c
+++ b/src/nvim/memfile.c
@@ -459,11 +459,9 @@ int mf_sync(memfile_T *mfp, int flags)
if (hp == NULL || status == FAIL)
mfp->mf_dirty = false;
- if ((flags & MFS_FLUSH) && *p_sws != NUL) {
- if (STRCMP(p_sws, "fsync") == 0) {
- if (os_fsync(mfp->mf_fd)) {
- status = FAIL;
- }
+ if (flags & MFS_FLUSH) {
+ if (os_fsync(mfp->mf_fd)) {
+ status = FAIL;
}
}
diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h
index 938aa9bc83..7a837de45c 100644
--- a/src/nvim/option_defs.h
+++ b/src/nvim/option_defs.h
@@ -535,27 +535,26 @@ EXTERN int p_stmp; /* 'shelltemp' */
#ifdef BACKSLASH_IN_FILENAME
EXTERN int p_ssl; /* 'shellslash' */
#endif
-EXTERN char_u *p_stl; /* 'statusline' */
-EXTERN int p_sr; /* 'shiftround' */
-EXTERN char_u *p_shm; /* 'shortmess' */
-EXTERN char_u *p_sbr; /* 'showbreak' */
-EXTERN int p_sc; /* 'showcmd' */
-EXTERN int p_sft; /* 'showfulltag' */
-EXTERN int p_sm; /* 'showmatch' */
-EXTERN int p_smd; /* 'showmode' */
-EXTERN long p_ss; /* 'sidescroll' */
-EXTERN long p_siso; /* 'sidescrolloff' */
-EXTERN int p_scs; /* 'smartcase' */
-EXTERN int p_sta; /* 'smarttab' */
-EXTERN int p_sb; /* 'splitbelow' */
-EXTERN long p_tpm; /* 'tabpagemax' */
-EXTERN char_u *p_tal; /* 'tabline' */
-EXTERN char_u *p_sps; /* 'spellsuggest' */
-EXTERN int p_spr; /* 'splitright' */
-EXTERN int p_sol; /* 'startofline' */
-EXTERN char_u *p_su; /* 'suffixes' */
-EXTERN char_u *p_sws; /* 'swapsync' */
-EXTERN char_u *p_swb; /* 'switchbuf' */
+EXTERN char_u *p_stl; // 'statusline'
+EXTERN int p_sr; // 'shiftround'
+EXTERN char_u *p_shm; // 'shortmess'
+EXTERN char_u *p_sbr; // 'showbreak'
+EXTERN int p_sc; // 'showcmd'
+EXTERN int p_sft; // 'showfulltag'
+EXTERN int p_sm; // 'showmatch'
+EXTERN int p_smd; // 'showmode'
+EXTERN long p_ss; // 'sidescroll'
+EXTERN long p_siso; // 'sidescrolloff'
+EXTERN int p_scs; // 'smartcase'
+EXTERN int p_sta; // 'smarttab'
+EXTERN int p_sb; // 'splitbelow'
+EXTERN long p_tpm; // 'tabpagemax'
+EXTERN char_u *p_tal; // 'tabline'
+EXTERN char_u *p_sps; // 'spellsuggest'
+EXTERN int p_spr; // 'splitright'
+EXTERN int p_sol; // 'startofline'
+EXTERN char_u *p_su; // 'suffixes'
+EXTERN char_u *p_swb; // 'switchbuf'
EXTERN unsigned swb_flags;
#ifdef IN_OPTION_C
static char *(p_swb_values[]) = {"useopen", "usetab", "split", "newtab", NULL};
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index cdac6ffd5c..dd959c1ece 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -2297,13 +2297,6 @@ return {
defaults={if_true={vi=true}}
},
{
- full_name='swapsync', abbreviation='sws',
- type='string', scope={'global'},
- vi_def=true,
- varname='p_sws',
- defaults={if_true={vi="fsync"}}
- },
- {
full_name='switchbuf', abbreviation='swb',
type='string', list='comma', scope={'global'},
deny_duplicates=true,