summaryrefslogtreecommitdiff
path: root/src/option.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-07-21 17:53:25 +0200
committerBram Moolenaar <Bram@vim.org>2015-07-21 17:53:25 +0200
commit165bc69d1b7f70ca9d5b657f35d0584ecb7b5183 (patch)
treec22d03e0ebc155a50b20749f8bedd84867a20a13 /src/option.c
parent6561d52ecbe6e24d1b90403078cc8b76c53c42fc (diff)
downloadvim-165bc69d1b7f70ca9d5b657f35d0584ecb7b5183.zip
patch 7.4.793
Problem: Can't specify when not to ring the bell. Solution: Add the 'belloff' option. (Christian Brabandt)
Diffstat (limited to 'src/option.c')
-rw-r--r--src/option.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/option.c b/src/option.c
index a356f9613..b0f28d259 100644
--- a/src/option.c
+++ b/src/option.c
@@ -632,6 +632,9 @@ static struct vimoption
{"beautify", "bf", P_BOOL|P_VI_DEF,
(char_u *)NULL, PV_NONE,
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+ {"belloff", "bo", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+ (char_u *)&p_bo, PV_NONE,
+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
{"binary", "bin", P_BOOL|P_VI_DEF|P_RSTAT,
(char_u *)&p_bin, PV_BIN,
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
@@ -5323,6 +5326,7 @@ didset_options()
(void)opt_strings_flags(p_cmp, p_cmp_values, &cmp_flags, TRUE);
#endif
(void)opt_strings_flags(p_bkc, p_bkc_values, &bkc_flags, TRUE);
+ (void)opt_strings_flags(p_bo, p_bo_values, &bo_flags, TRUE);
#ifdef FEAT_SESSION
(void)opt_strings_flags(p_ssop, p_ssop_values, &ssop_flags, TRUE);
(void)opt_strings_flags(p_vop, p_ssop_values, &vop_flags, TRUE);
@@ -6997,6 +7001,11 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
else if (check_opt_strings(p_bs, p_bs_values, TRUE) != OK)
errmsg = e_invarg;
}
+ else if (varp == &p_bo)
+ {
+ if (opt_strings_flags(p_bo, p_bo_values, &bo_flags, TRUE) != OK)
+ errmsg = e_invarg;
+ }
#ifdef FEAT_MBYTE
/* 'casemap' */