diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_cmds.lua | 6 | ||||
| -rw-r--r-- | src/nvim/memfile.c | 8 | ||||
| -rw-r--r-- | src/nvim/option_defs.h | 41 | ||||
| -rw-r--r-- | src/nvim/options.lua | 28 | ||||
| -rw-r--r-- | src/nvim/os/win_defs.h | 3 |
5 files changed, 26 insertions, 60 deletions
diff --git a/src/nvim/ex_cmds.lua b/src/nvim/ex_cmds.lua index 702abf3cf0..6c8835b5c5 100644 --- a/src/nvim/ex_cmds.lua +++ b/src/nvim/ex_cmds.lua @@ -1025,12 +1025,6 @@ return { func='ex_helpclose', }, { - command='helpfind', - flags=bit.bor(EXTRA, NOTRLCOM), - addr_type=ADDR_LINES, - func='ex_ni', - }, - { command='helpgrep', flags=bit.bor(EXTRA, NOTRLCOM, NEEDARG), addr_type=ADDR_LINES, 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..0eccf63e15 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -1144,20 +1144,6 @@ return { defaults={if_true={vi=false}} }, { - full_name='imactivatefunc', abbreviation='imaf', - type='string', scope={'global'}, - secure=true, - vi_def=true, - enable_if=false, - }, - { - full_name='imactivatekey', abbreviation='imak', - type='string', scope={'global'}, - vi_def=true, - enable_if=false, - defaults={if_true={vi=""}} - }, - { full_name='imcmdline', abbreviation='imc', type='bool', scope={'global'}, vi_def=true, @@ -1194,13 +1180,6 @@ return { } }, { - full_name='imstatusfunc', abbreviation='imsf', - type='string', scope={'global'}, - secure=true, - vi_def=true, - enable_if=false, - }, - { full_name='include', abbreviation='inc', type='string', scope={'global', 'buffer'}, vi_def=true, @@ -2297,13 +2276,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, diff --git a/src/nvim/os/win_defs.h b/src/nvim/os/win_defs.h index e6a714601f..673fff3ad0 100644 --- a/src/nvim/os/win_defs.h +++ b/src/nvim/os/win_defs.h @@ -17,6 +17,9 @@ #define USE_CRNL +// We have our own RGB macro in macros.h. +#undef RGB + #ifdef _MSC_VER # ifndef inline # define inline __inline |