diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-09-14 09:07:34 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-09-14 09:07:34 +0000 |
| commit | d29a9eefb691be9c885d786d63e30e571d7a08bd (patch) | |
| tree | e1bbb9ce93407214111649bd855a879afdff0dc3 | |
| parent | a391707d9fda5645dbc737de22b30185aeb7c7e4 (diff) | |
| download | vim-git-d29a9eefb691be9c885d786d63e30e571d7a08bd.tar.gz | |
updated for version 7.0-104v7.0.104
| -rw-r--r-- | src/edit.c | 11 | ||||
| -rw-r--r-- | src/fileio.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 18 insertions, 1 deletions
diff --git a/src/edit.c b/src/edit.c index aa03d8d87..94456aea7 100644 --- a/src/edit.c +++ b/src/edit.c @@ -707,6 +707,11 @@ edit(cmdchar, startln, count) lastc = c; /* remember previous char for CTRL-D */ c = safe_vgetc(); +#ifdef FEAT_AUTOCMD + /* Don't want K_CURSORHOLD for the second key, e.g., after CTRL-V. */ + did_cursorhold = TRUE; +#endif + #ifdef FEAT_RIGHTLEFT if (p_hkmap && KeyTyped) c = hkmap(c); /* Hebrew mode mapping */ @@ -1389,6 +1394,12 @@ normalchar: break; } /* end of switch (c) */ +#ifdef FEAT_AUTOCMD + /* If typed something may trigger CursorHoldI again. */ + if (c != K_CURSORHOLD) + did_cursorhold = FALSE; +#endif + /* If the cursor was moved we didn't just insert a space */ if (arrow_used) inserted_space = FALSE; diff --git a/src/fileio.c b/src/fileio.c index 2e2b826ca..42181e17b 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -8289,7 +8289,11 @@ trigger_cursorhold() { int state; - if (!did_cursorhold && has_cursorhold() && !Recording) + if (!did_cursorhold && has_cursorhold() && !Recording +#ifdef FEAT_INS_EXPAND + && !ins_compl_active() +#endif + ) { state = get_real_state(); if (state == NORMAL_BUSY || (state & INSERT) != 0) diff --git a/src/version.c b/src/version.c index 6f535dcb5..2767ec86f 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 */ /**/ + 104, +/**/ 103, /**/ 102, |