diff options
author | Bram Moolenaar <Bram@vim.org> | 2013-11-04 02:01:01 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2013-11-04 02:01:01 +0100 |
commit | 332a2cadcd19a0ac69b9c41ed6f4add89128fdfe (patch) | |
tree | b65f50223786078a850df54fe8cde79cf73e09c3 | |
parent | d9820538bd6c83c51d24e3481cadf79ccaa9549e (diff) |
updated for version 7.4.065v7.4.065
Problem: When recording, the character typed at the hit-enter prompt is
recorded twice. (Urtica Dioica)
Solution: Avoid recording the character twice. (Christian Brabandt)
-rw-r--r-- | src/message.c | 12 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/message.c b/src/message.c index 5f00c01c08..0bbd87fb35 100644 --- a/src/message.c +++ b/src/message.c @@ -887,6 +887,8 @@ wait_return(redraw) int oldState; int tmpState; int had_got_int; + int save_Recording; + FILE *save_scriptout; if (redraw == TRUE) must_redraw = CLEAR; @@ -957,11 +959,21 @@ wait_return(redraw) * typeahead buffer. */ ++no_mapping; ++allow_keys; + + /* Temporarily disable Recording. If Recording is active, the + * character will be recorded later, since it will be added to the + * typebuf after the loop */ + save_Recording = Recording; + save_scriptout = scriptout; + Recording = FALSE; + scriptout = NULL; c = safe_vgetc(); if (had_got_int && !global_busy) got_int = FALSE; --no_mapping; --allow_keys; + Recording = save_Recording; + scriptout = save_scriptout; #ifdef FEAT_CLIPBOARD /* Strange way to allow copying (yanking) a modeless selection at diff --git a/src/version.c b/src/version.c index 6610be7bb0..02cca4348b 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 65, +/**/ 64, /**/ 63, |