diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-01-23 22:23:09 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-01-23 22:23:09 +0000 |
| commit | 09df3127f43aa9804e077726ac1bf17cb9e2c85f (patch) | |
| tree | 752b65fa5bce149cf43f81dc228204c2be88dc30 /src | |
| parent | 33aec765bdc2096f123c5a4c61f8948a61aa9ef5 (diff) | |
| download | vim-git-09df3127f43aa9804e077726ac1bf17cb9e2c85f.tar.gz | |
updated for version 7.0186
Diffstat (limited to 'src')
| -rw-r--r-- | src/getchar.c | 4 | ||||
| -rw-r--r-- | src/normal.c | 16 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/getchar.c b/src/getchar.c index c1c9bca75..5da7537ff 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -2365,7 +2365,7 @@ vgetorpeek(advance) colnr_T col = 0, vcol; char_u *ptr; - if (p_smd) + if (p_smd && msg_silent == 0) { unshowmode(TRUE); mode_deleted = TRUE; @@ -2641,7 +2641,7 @@ vgetorpeek(advance) * if we return an ESC to exit insert mode, the message is deleted * if we don't return an ESC but deleted the message before, redisplay it */ - if (advance && p_smd && (State & INSERT)) + if (advance && p_smd && msg_silent == 0 && (State & INSERT)) { if (c == ESC && !mode_deleted && !no_mapping) { diff --git a/src/normal.c b/src/normal.c index 310a6f054..4d105e731 100644 --- a/src/normal.c +++ b/src/normal.c @@ -1165,6 +1165,7 @@ getcount: * Don't redraw the screen, it would remove the message. */ if ( ((p_smd + && msg_silent == 0 && (restart_edit != 0 #ifdef FEAT_VISUAL || (VIsual_active @@ -1713,7 +1714,7 @@ do_pending_operator(cap, old_col, gui_yank) setmouse(); mouse_dragging = 0; # endif - if (p_smd) + if (p_smd && msg_silent == 0) clear_cmdline = TRUE; /* unshow visual mode later */ #ifdef FEAT_CMDL_INFO else @@ -2947,7 +2948,8 @@ do_mouse(oap, c, dir, count, fixindent) } /* If Visual mode changed show it later. */ - if (p_smd && (VIsual_active != old_active || VIsual_mode != old_mode)) + if (p_smd && msg_silent == 0 + && (VIsual_active != old_active || VIsual_mode != old_mode)) redraw_cmdline = TRUE; #endif @@ -3113,7 +3115,7 @@ end_visual_mode() curwin->w_cursor.coladd = 0; #endif - if (p_smd) + if (p_smd && msg_silent == 0) clear_cmdline = TRUE; /* unshow visual mode later */ #ifdef FEAT_CMDL_INFO else @@ -3644,7 +3646,7 @@ add_to_showcmd(c) }; #endif - if (!p_sc) + if (!p_sc || msg_silent != 0) return FALSE; if (showcmd_visual) @@ -7138,7 +7140,7 @@ nv_visual(cap) #ifdef FEAT_MOUSE setmouse(); #endif - if (p_smd) + if (p_smd && msg_silent == 0) redraw_cmdline = TRUE; /* show visual mode later */ /* * For V and ^V, we multiply the number of lines even if there @@ -7235,7 +7237,7 @@ n_start_visual_mode(c) #ifdef FEAT_MOUSE setmouse(); #endif - if (p_smd) + if (p_smd && msg_silent == 0) redraw_cmdline = TRUE; /* show visual mode later */ #ifdef FEAT_CLIPBOARD /* Make sure the clipboard gets updated. Needed because start and @@ -8280,7 +8282,7 @@ nv_normal(cap) if (cap->nchar == Ctrl_N || cap->nchar == Ctrl_G) { clearop(cap->oap); - if (restart_edit != 0 && p_smd) + if (restart_edit != 0 && p_smd && msg_silent == 0) clear_cmdline = TRUE; /* unshow mode later */ restart_edit = 0; #ifdef FEAT_CMDWIN |