summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-10-02 20:55:54 +0000
committerBram Moolenaar <Bram@vim.org>2008-10-02 20:55:54 +0000
commitd9205ca1fdc3a8ed6c1629eaddfefa061d898fec (patch)
tree9e3f922649e8ed4ada73c1c7ce14e06863733c37
parent991e10f3c7dd8a70ed6e8e975dab438ae85d73bc (diff)
downloadvim-git-d9205ca1fdc3a8ed6c1629eaddfefa061d898fec.tar.gz
updated for version 7.2-025v7.2.025
-rw-r--r--src/normal.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/normal.c b/src/normal.c
index 462bd35f5..c1e630a33 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -1132,7 +1132,8 @@ getcount:
out_flush();
#endif
#ifdef FEAT_AUTOCMD
- did_cursorhold = FALSE;
+ if (ca.cmdchar != K_IGNORE)
+ did_cursorhold = FALSE;
#endif
State = NORMAL;
diff --git a/src/version.c b/src/version.c
index c5dc0fde9..45bb7e5fb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 25,
+/**/
24,
/**/
23,