summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-06-29 14:47:22 +0200
committerBram Moolenaar <bram@vim.org>2013-06-29 14:47:22 +0200
commit924ee7068a4f0dcf6bd931ad815588f92ae52036 (patch)
tree695412aa991830cd0d1105c102bedebf2fb31815
parent96799ef4372a5730dc33563df4bcc5f21643ba4c (diff)
downloadvim-924ee7068a4f0dcf6bd931ad815588f92ae52036.tar.gz
updated for version 7.3.1264v7.3.1264v7-3-1264
Problem: Missing m_nowait. Solution: Include missing part of the patch.
-rw-r--r--src/structs.h3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/structs.h b/src/structs.h
index 96435eda..1fc91dc9 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1004,12 +1004,13 @@ struct mapblock
{
mapblock_T *m_next; /* next mapblock in list */
char_u *m_keys; /* mapped from, lhs */
- int m_keylen; /* strlen(m_keys) */
char_u *m_str; /* mapped to, rhs */
char_u *m_orig_str; /* rhs as entered by the user */
+ int m_keylen; /* strlen(m_keys) */
int m_mode; /* valid mode */
int m_noremap; /* if non-zero no re-mapping for m_str */
char m_silent; /* <silent> used, don't echo commands */
+ char m_nowait; /* <nowait> used */
#ifdef FEAT_EVAL
char m_expr; /* <expr> used, m_str is an expression */
scid_T m_script_ID; /* ID of script where map was defined */
diff --git a/src/version.c b/src/version.c
index c1b1c25b..f8dcc142 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1264,
+/**/
1263,
/**/
1262,