diff options
author | Bram Moolenaar <Bram@vim.org> | 2015-07-21 17:53:25 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2015-07-21 17:53:25 +0200 |
commit | 165bc69d1b7f70ca9d5b657f35d0584ecb7b5183 (patch) | |
tree | c22d03e0ebc155a50b20749f8bedd84867a20a13 /src/edit.c | |
parent | 6561d52ecbe6e24d1b90403078cc8b76c53c42fc (diff) | |
download | vim-git-165bc69d1b7f70ca9d5b657f35d0584ecb7b5183.tar.gz |
patch 7.4.793v7.4.793
Problem: Can't specify when not to ring the bell.
Solution: Add the 'belloff' option. (Christian Brabandt)
Diffstat (limited to 'src/edit.c')
-rw-r--r-- | src/edit.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/edit.c b/src/edit.c index ca11fd940..5d3bd8279 100644 --- a/src/edit.c +++ b/src/edit.c @@ -982,7 +982,7 @@ do_intr: got_int = FALSE; } else - vim_beep(); + vim_beep(BO_IM); break; } doESCkey: @@ -2210,7 +2210,7 @@ has_compl_option(dict_opt) hl_attr(HLF_E)); if (emsg_silent == 0) { - vim_beep(); + vim_beep(BO_COMPL); setcursor(); out_flush(); ui_delay(2000L, FALSE); @@ -8263,7 +8263,7 @@ ins_reg() } if (regname == NUL || !valid_yank_reg(regname, FALSE)) { - vim_beep(); + vim_beep(BO_REG); need_redraw = TRUE; /* remove the '"' */ } else @@ -8281,7 +8281,7 @@ ins_reg() } else if (insert_reg(regname, literally) == FAIL) { - vim_beep(); + vim_beep(BO_REG); need_redraw = TRUE; /* remove the '"' */ } else if (stop_insert_mode) @@ -8355,7 +8355,7 @@ ins_ctrl_g() break; /* Unknown CTRL-G command, reserved for future expansion. */ - default: vim_beep(); + default: vim_beep(BO_CTRLG); } } @@ -8781,12 +8781,12 @@ ins_del() temp = curwin->w_cursor.col; if (!can_bs(BS_EOL) /* only if "eol" included */ || do_join(2, FALSE, TRUE, FALSE, FALSE) == FAIL) - vim_beep(); + vim_beep(BO_BS); else curwin->w_cursor.col = temp; } - else if (del_char(FALSE) == FAIL) /* delete char under cursor */ - vim_beep(); + else if (del_char(FALSE) == FAIL) /* delete char under cursor */ + vim_beep(BO_BS); did_ai = FALSE; #ifdef FEAT_SMARTINDENT did_si = FALSE; @@ -8861,7 +8861,7 @@ ins_bs(c, mode, inserted_space_p) && curwin->w_cursor.col <= ai_col) || (!can_bs(BS_EOL) && curwin->w_cursor.col == 0)))) { - vim_beep(); + vim_beep(BO_BS); return FALSE; } @@ -9473,7 +9473,7 @@ ins_left() curwin->w_set_curswant = TRUE; /* so we stay at the end */ } else - vim_beep(); + vim_beep(BO_CRSR); } static void @@ -9533,7 +9533,7 @@ ins_s_left() curwin->w_set_curswant = TRUE; } else - vim_beep(); + vim_beep(BO_CRSR); } static void @@ -9583,7 +9583,7 @@ ins_right() curwin->w_cursor.col = 0; } else - vim_beep(); + vim_beep(BO_CRSR); } static void @@ -9602,7 +9602,7 @@ ins_s_right() curwin->w_set_curswant = TRUE; } else - vim_beep(); + vim_beep(BO_CRSR); } static void @@ -9633,7 +9633,7 @@ ins_up(startcol) #endif } else - vim_beep(); + vim_beep(BO_CRSR); } static void @@ -9665,7 +9665,7 @@ ins_pageup() #endif } else - vim_beep(); + vim_beep(BO_CRSR); } static void @@ -9696,7 +9696,7 @@ ins_down(startcol) #endif } else - vim_beep(); + vim_beep(BO_CRSR); } static void @@ -9728,7 +9728,7 @@ ins_pagedown() #endif } else - vim_beep(); + vim_beep(BO_CRSR); } #ifdef FEAT_DND @@ -10146,7 +10146,7 @@ ins_copychar(lnum) if (lnum < 1 || lnum > curbuf->b_ml.ml_line_count) { - vim_beep(); + vim_beep(BO_COPY); return NUL; } @@ -10169,7 +10169,7 @@ ins_copychar(lnum) c = *ptr; #endif if (c == NUL) - vim_beep(); + vim_beep(BO_COPY); return c; } |