aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/message.c
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johanhelsing@gmail.com>2015-10-16 21:28:12 +0200
committerJohan Klokkhammer Helsing <johanhelsing@gmail.com>2015-10-18 01:58:18 +0200
commit3bb266266935e9bf95f4a776b33800b9303d4607 (patch)
tree305b7e72e04b30be2ed052df262ab6b771e7469d /src/nvim/message.c
parente9de70e4ea53cd7ab70eba0757309004c61c3c62 (diff)
downloadrneovim-3bb266266935e9bf95f4a776b33800b9303d4607.tar.gz
rneovim-3bb266266935e9bf95f4a776b33800b9303d4607.tar.bz2
rneovim-3bb266266935e9bf95f4a776b33800b9303d4607.zip
vim-patch:7.4.793
Problem: Can't specify when not to ring the bell. Solution: Add the 'belloff' option. (Christian Brabandt) https://github.com/vim/vim/commit/165bc69d1b7f70ca9d5b657f35d0584ecb7b5183
Diffstat (limited to 'src/nvim/message.c')
-rw-r--r--src/nvim/message.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/nvim/message.c b/src/nvim/message.c
index 8263ff4896..5f06506a31 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -1731,12 +1731,12 @@ static void msg_puts_display(char_u *str, int maxlen, int attr, int recurse)
if (msg_col)
--msg_col;
} else if (*s == TAB) { /* translate Tab into spaces */
- do
+ do {
msg_screen_putchar(' ', attr);
- while (msg_col & 7);
- } else if (*s == BELL) /* beep (from ":sh") */
- vim_beep();
- else {
+ } while (msg_col & 7);
+ } else if (*s == BELL) { // beep (from ":sh")
+ vim_beep(BO_SH);
+ } else {
if (has_mbyte) {
cw = (*mb_ptr2cells)(s);
if (enc_utf8 && maxlen >= 0)
@@ -1897,9 +1897,9 @@ void show_sb_text(void)
/* Only show something if there is more than one line, otherwise it looks
* weird, typing a command without output results in one line. */
mp = msg_sb_start(last_msgchunk);
- if (mp == NULL || mp->sb_prev == NULL)
- vim_beep();
- else {
+ if (mp == NULL || mp->sb_prev == NULL) {
+ vim_beep(BO_MESS);
+ } else {
do_more_prompt('G');
wait_return(FALSE);
}