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/normal.c | |
| parent | a84b10685c8f2c4cc1f7846fddae6b29bc4aee0f (diff) | |
| download | vim-git-61abfd1171924eddc619a9bb13dfea788a16ac2e.tar.gz | |
updated for version 7.1-104v7.1.104
Diffstat (limited to 'src/normal.c')
| -rw-r--r-- | src/normal.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/normal.c b/src/normal.c index 65f7773f8..fbc430a9f 100644 --- a/src/normal.c +++ b/src/normal.c @@ -696,7 +696,7 @@ getcount: ++allow_keys; /* no mapping for nchar, but keys */ } ++no_zero_mapping; /* don't map zero here */ - c = safe_vgetc(); + c = plain_vgetc(); #ifdef FEAT_LANGMAP LANGMAP_ADJUST(c, TRUE); #endif @@ -721,7 +721,7 @@ getcount: ca.count0 = 0; ++no_mapping; ++allow_keys; /* no mapping for nchar, but keys */ - c = safe_vgetc(); /* get next character */ + c = plain_vgetc(); /* get next character */ #ifdef FEAT_LANGMAP LANGMAP_ADJUST(c, TRUE); #endif @@ -900,7 +900,7 @@ getcount: * For 'g' get the next character now, so that we can check for * "gr", "g'" and "g`". */ - ca.nchar = safe_vgetc(); + ca.nchar = plain_vgetc(); #ifdef FEAT_LANGMAP LANGMAP_ADJUST(ca.nchar, TRUE); #endif @@ -957,7 +957,7 @@ getcount: im_set_active(TRUE); #endif - *cp = safe_vgetc(); + *cp = plain_vgetc(); if (langmap_active) { @@ -1045,7 +1045,7 @@ getcount: } if (c > 0) { - c = safe_vgetc(); + c = plain_vgetc(); if (c != Ctrl_N && c != Ctrl_G) vungetc(c); else @@ -1064,7 +1064,7 @@ getcount: while (enc_utf8 && lang && (c = vpeekc()) > 0 && (c >= 0x100 || MB_BYTE2LEN(vpeekc()) > 1)) { - c = safe_vgetc(); + c = plain_vgetc(); if (!utf_iscomposing(c)) { vungetc(c); /* it wasn't, put it back */ @@ -4564,7 +4564,7 @@ nv_zet(cap) #endif ++no_mapping; ++allow_keys; /* no mapping for nchar, but allow key codes */ - nchar = safe_vgetc(); + nchar = plain_vgetc(); #ifdef FEAT_LANGMAP LANGMAP_ADJUST(nchar, TRUE); #endif @@ -4922,7 +4922,7 @@ dozet: case 'u': /* "zug" and "zuw": undo "zg" and "zw" */ ++no_mapping; ++allow_keys; /* no mapping for nchar, but allow key codes */ - nchar = safe_vgetc(); + nchar = plain_vgetc(); #ifdef FEAT_LANGMAP LANGMAP_ADJUST(nchar, TRUE); #endif |