diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-01-19 22:09:32 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-01-19 22:09:32 +0000 |
| commit | 05a7bb363b6ae132b7f2550be1a588e481a5dfa3 (patch) | |
| tree | 97c44382074f466a7c5a3c31f8debe0127473ade /src/normal.c | |
| parent | c32840f2674d4c6b06cfac8ec32791b5451bf31c (diff) | |
| download | vim-git-05a7bb363b6ae132b7f2550be1a588e481a5dfa3.tar.gz | |
updated for version 7.0182
Diffstat (limited to 'src/normal.c')
| -rw-r--r-- | src/normal.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/normal.c b/src/normal.c index b0262b222..12ede7375 100644 --- a/src/normal.c +++ b/src/normal.c @@ -788,15 +788,14 @@ getcount: clearopbeep(oap); goto normal_end; } -#ifdef FEAT_CMDWIN - if (cmdwin_type != 0 && (nv_cmds[idx].cmd_flags & NV_NCW)) + + if (editing_cmdline() && (nv_cmds[idx].cmd_flags & NV_NCW)) { - /* This command is not allowed in the cmdline window: beep. */ + /* This command is not allowed wile editing a ccmdline: beep. */ clearopbeep(oap); - EMSG(_(e_cmdwin)); + editing_cmdline_msg(); goto normal_end; } -#endif #ifdef FEAT_VISUAL /* @@ -3640,6 +3639,7 @@ add_to_showcmd(c) K_RIGHTMOUSE, K_RIGHTDRAG, K_RIGHTRELEASE, K_MOUSEDOWN, K_MOUSEUP, K_X1MOUSE, K_X1DRAG, K_X1RELEASE, K_X2MOUSE, K_X2DRAG, K_X2RELEASE, + K_CURSORHOLD, 0 }; #endif @@ -5741,13 +5741,12 @@ nv_gotofile(cap) { char_u *ptr; -#ifdef FEAT_CMDWIN - if (cmdwin_type != 0) + if (editing_cmdline()) { clearopbeep(cap->oap); + editing_cmdline_msg(); return; } -#endif ptr = grab_file_name(cap->count1); @@ -7802,13 +7801,13 @@ nv_g_cmd(cap) /* "gQ": improved Ex mode */ case 'Q': -#ifdef FEAT_CMDWIN - if (cmdwin_type != 0) + if (editing_cmdline()) { clearopbeep(cap->oap); + editing_cmdline_msg(); break; } -#endif + if (!checkclearopq(oap)) do_exmode(TRUE); break; |