summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-09-17 20:32:20 +0200
committerBram Moolenaar <Bram@vim.org>2017-09-17 20:32:20 +0200
commit63c4e8a1986796094e6f15b893f2deccdf482617 (patch)
tree0f2c621c467c3b6558918d02fb6bb04a8b511dd5 /src
parent8adb0d03ca2694922da915356d7ede05e31c5a5c (diff)
patch 8.0.1120: :tm means :tmap instead of :tmenuv8.0.1120
Problem: :tm means :tmap instead of :tmenu. (Taro Muraoka) Solution: Move the new entry below the old entry. (closes #2102)
Diffstat (limited to 'src')
-rw-r--r--src/ex_cmds.h10
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 5 deletions
diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index 0cc279dabc..41c7c80cb7 100644
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -1498,15 +1498,15 @@ EX(CMD_tjump, "tjump", ex_tag,
EX(CMD_tlast, "tlast", ex_tag,
BANG|TRLBAR,
ADDR_LINES),
+EX(CMD_tmenu, "tmenu", ex_menu,
+ RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+ ADDR_LINES),
EX(CMD_tmap, "tmap", ex_map,
EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
ADDR_LINES),
EX(CMD_tmapclear, "tmapclear", ex_mapclear,
EXTRA|TRLBAR|CMDWIN,
ADDR_LINES),
-EX(CMD_tmenu, "tmenu", ex_menu,
- RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
- ADDR_LINES),
EX(CMD_tnext, "tnext", ex_tag,
RANGE|NOTADR|BANG|TRLBAR|ZEROR,
ADDR_LINES),
@@ -1528,10 +1528,10 @@ EX(CMD_try, "try", ex_try,
EX(CMD_tselect, "tselect", ex_tag,
BANG|TRLBAR|WORD1,
ADDR_LINES),
-EX(CMD_tunmap, "tunmap", ex_unmap,
+EX(CMD_tunmenu, "tunmenu", ex_menu,
EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
ADDR_LINES),
-EX(CMD_tunmenu, "tunmenu", ex_menu,
+EX(CMD_tunmap, "tunmap", ex_unmap,
EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
ADDR_LINES),
EX(CMD_undo, "undo", ex_undo,
diff --git a/src/version.c b/src/version.c
index 893de43ac6..dae5d3f081 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1120,
+/**/
1119,
/**/
1118,