IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

lint

Browse Source
This commit is contained in:
James McCoy 2016-09-22 00:25:38 -04:00
parent dafca1ad68
commit 9419a4c86c
No known key found for this signature in database
GPG Key ID: DFE691AE331BA3DB
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/option.c
View File

@ -2518,15 +2518,15 @@ did_set_string_option (
else if (varp == &p_sbo) { else if (varp == &p_sbo) {
if (check_opt_strings(p_sbo, p_scbopt_values, TRUE) != OK) if (check_opt_strings(p_sbo, p_scbopt_values, TRUE) != OK)
errmsg = e_invarg; errmsg = e_invarg;
} } else if (varp == &p_ambw || (bool *)varp == &p_emoji) {
/* 'ambiwidth' */ // 'ambiwidth'
else if (varp == &p_ambw || (bool *)varp == &p_emoji) { if (check_opt_strings(p_ambw, p_ambw_values, false) != OK) {
if (check_opt_strings(p_ambw, p_ambw_values, FALSE) != OK)
errmsg = e_invarg; errmsg = e_invarg;
else if (set_chars_option(&p_lcs) != NULL) } else if (set_chars_option(&p_lcs) != NULL) {
errmsg = (char_u *)_("E834: Conflicts with value of 'listchars'"); errmsg = (char_u *)_("E834: Conflicts with value of 'listchars'");
else if (set_chars_option(&p_fcs) != NULL) } else if (set_chars_option(&p_fcs) != NULL) {
errmsg = (char_u *)_("E835: Conflicts with value of 'fillchars'"); errmsg = (char_u *)_("E835: Conflicts with value of 'fillchars'");
}
} }
/* 'background' */ /* 'background' */
else if (varp == &p_bg) { else if (varp == &p_bg) {

36
src/nvim/option_defs.h
View File

@ -401,25 +401,25 @@ static char *(p_dy_values[]) = {"lastline", "uhex", NULL};
#endif #endif
#define DY_LASTLINE 0x001 #define DY_LASTLINE 0x001
#define DY_UHEX 0x002 #define DY_UHEX 0x002
EXTERN int p_ed; /* 'edcompatible' */ EXTERN int p_ed; // 'edcompatible'
EXTERN bool p_emoji; // 'emoji' EXTERN bool p_emoji; // 'emoji'
EXTERN char_u *p_ead; /* 'eadirection' */ EXTERN char_u *p_ead; // 'eadirection'
EXTERN bool p_ea; /* 'equalalways' */ EXTERN bool p_ea; // 'equalalways'
EXTERN char_u *p_ep; /* 'equalprg' */ EXTERN char_u *p_ep; // 'equalprg'
EXTERN int p_eb; /* 'errorbells' */ EXTERN int p_eb; // 'errorbells'
EXTERN char_u *p_ef; /* 'errorfile' */ EXTERN char_u *p_ef; // 'errorfile'
EXTERN char_u *p_efm; /* 'errorformat' */ EXTERN char_u *p_efm; // 'errorformat'
EXTERN char_u *p_gefm; /* 'grepformat' */ EXTERN char_u *p_gefm; // 'grepformat'
EXTERN char_u *p_gp; /* 'grepprg' */ EXTERN char_u *p_gp; // 'grepprg'
EXTERN char_u *p_ei; /* 'eventignore' */ EXTERN char_u *p_ei; // 'eventignore'
EXTERN int p_ek; /* 'esckeys' */ EXTERN int p_ek; // 'esckeys'
EXTERN int p_exrc; /* 'exrc' */ EXTERN int p_exrc; // 'exrc'
EXTERN char_u *p_fencs; /* 'fileencodings' */ EXTERN char_u *p_fencs; // 'fileencodings'
EXTERN char_u *p_ffs; /* 'fileformats' */ EXTERN char_u *p_ffs; // 'fileformats'
EXTERN bool p_fic; ///< 'fileignorecase' EXTERN bool p_fic; // 'fileignorecase'
EXTERN char_u *p_fcl; /* 'foldclose' */ EXTERN char_u *p_fcl; // 'foldclose'
EXTERN long p_fdls; /* 'foldlevelstart' */ EXTERN long p_fdls; // 'foldlevelstart'
EXTERN char_u *p_fdo; /* 'foldopen' */ EXTERN char_u *p_fdo; // 'foldopen'
EXTERN unsigned fdo_flags; EXTERN unsigned fdo_flags;
# ifdef IN_OPTION_C # ifdef IN_OPTION_C
static char *(p_fdo_values[]) = {"all", "block", "hor", "mark", "percent", static char *(p_fdo_values[]) = {"all", "block", "hor", "mark", "percent",