diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-08-08 19:42:05 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-08-08 19:42:05 +0000 |
| commit | c2f5abcf152b0bf25cc25c364ec6d0d0bfe58066 (patch) | |
| tree | 785291aa55427efcf30d28ff21332b3bfe565d21 | |
| parent | 1b0b07f29e5762f14f22f5d99dd4aba011785c74 (diff) | |
| download | vim-git-c2f5abcf152b0bf25cc25c364ec6d0d0bfe58066.tar.gz | |
updated for version 7.1-057v7.1.057
| -rw-r--r-- | src/normal.c | 18 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 16 insertions, 4 deletions
diff --git a/src/normal.c b/src/normal.c index b1f8c6a8c..000d2e126 100644 --- a/src/normal.c +++ b/src/normal.c @@ -889,6 +889,11 @@ getcount: ++no_mapping; ++allow_keys; /* no mapping for nchar, but allow key codes */ +#ifdef FEAT_AUTOCMD + /* Don't generate a CursorHold event here, most commands can't handle + * it, e.g., nv_replace(), nv_csearch(). */ + did_cursorhold = TRUE; +#endif if (ca.cmdchar == 'g') { /* @@ -6662,6 +6667,13 @@ nv_replace(cap) else had_ctrl_v = NUL; + /* Abort if the character is a special key. */ + if (IS_SPECIAL(cap->nchar)) + { + clearopbeep(cap->oap); + return; + } + #ifdef FEAT_VISUAL /* Visual mode "r" */ if (VIsual_active) @@ -6688,11 +6700,9 @@ nv_replace(cap) } #endif - /* - * Check for a special key or not enough characters to replace. - */ + /* Abort if not enough characters to replace. */ ptr = ml_get_cursor(); - if (IS_SPECIAL(cap->nchar) || STRLEN(ptr) < (unsigned)cap->count1 + if (STRLEN(ptr) < (unsigned)cap->count1 #ifdef FEAT_MBYTE || (has_mbyte && mb_charlen(ptr) < cap->count1) #endif diff --git a/src/version.c b/src/version.c index ed6230db6..0627fb5cc 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 57, +/**/ 56, /**/ 55, |