diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-09-13 16:26:47 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-09-13 16:26:47 +0000 |
| commit | 61abfd1171924eddc619a9bb13dfea788a16ac2e (patch) | |
| tree | 3b63f79912a1ceccea9c52b9bcaee9e133e30425 /src/edit.c | |
| parent | a84b10685c8f2c4cc1f7846fddae6b29bc4aee0f (diff) | |
| download | vim-git-61abfd1171924eddc619a9bb13dfea788a16ac2e.tar.gz | |
updated for version 7.1-104v7.1.104
Diffstat (limited to 'src/edit.c')
| -rw-r--r-- | src/edit.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/edit.c b/src/edit.c index e5e0522f7..2cdf532dd 100644 --- a/src/edit.c +++ b/src/edit.c @@ -788,7 +788,7 @@ edit(cmdchar, startln, count) ins_redraw(FALSE); ++no_mapping; ++allow_keys; - c = safe_vgetc(); + c = plain_vgetc(); --no_mapping; --allow_keys; if (c != Ctrl_N && c != Ctrl_G && c != Ctrl_O) @@ -981,7 +981,7 @@ doESCkey: #ifdef FEAT_NETBEANS_INTG case K_F21: /* NetBeans command */ ++no_mapping; /* don't map the next key hits */ - i = safe_vgetc(); + i = plain_vgetc(); --no_mapping; netbeans_keycommand(i); break; @@ -5224,10 +5224,7 @@ get_literal() i = 0; for (;;) { - do - nc = safe_vgetc(); - while (nc == K_IGNORE || nc == K_VER_SCROLLBAR - || nc == K_HOR_SCROLLBAR); + nc = plain_vgetc(); #ifdef FEAT_CMDL_INFO if (!(State & CMDLINE) # ifdef FEAT_MBYTE @@ -7575,7 +7572,7 @@ ins_reg() * deleted when ESC is hit. */ ++no_mapping; - regname = safe_vgetc(); + regname = plain_vgetc(); #ifdef FEAT_LANGMAP LANGMAP_ADJUST(regname, TRUE); #endif @@ -7586,7 +7583,7 @@ ins_reg() #ifdef FEAT_CMDL_INFO add_to_showcmd_c(literally); #endif - regname = safe_vgetc(); + regname = plain_vgetc(); #ifdef FEAT_LANGMAP LANGMAP_ADJUST(regname, TRUE); #endif @@ -7677,7 +7674,7 @@ ins_ctrl_g() * deleted when ESC is hit. */ ++no_mapping; - c = safe_vgetc(); + c = plain_vgetc(); --no_mapping; switch (c) { @@ -9356,7 +9353,7 @@ ins_digraph() * mode message to be deleted when ESC is hit */ ++no_mapping; ++allow_keys; - c = safe_vgetc(); + c = plain_vgetc(); --no_mapping; --allow_keys; if (IS_SPECIAL(c) || mod_mask) /* special key */ @@ -9388,7 +9385,7 @@ ins_digraph() } ++no_mapping; ++allow_keys; - cc = safe_vgetc(); + cc = plain_vgetc(); --no_mapping; --allow_keys; if (cc != ESC) |