diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-09-17 20:32:20 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-09-17 20:32:20 +0200 |
| commit | 63c4e8a1986796094e6f15b893f2deccdf482617 (patch) | |
| tree | 0f2c621c467c3b6558918d02fb6bb04a8b511dd5 | |
| parent | 8adb0d03ca2694922da915356d7ede05e31c5a5c (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)
| -rw-r--r-- | runtime/doc/map.txt | 6 | ||||
| -rw-r--r-- | src/ex_cmds.h | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index 88fb622009..fcba510cbd 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -55,7 +55,7 @@ modes. :im[ap] {lhs} {rhs} |mapmode-i| *:im* *:imap* :lm[ap] {lhs} {rhs} |mapmode-l| *:lm* *:lmap* :cm[ap] {lhs} {rhs} |mapmode-c| *:cm* *:cmap* -:tm[ap] {lhs} {rhs} |mapmode-t| *:tm* *:tmap* +:tm[ap] {lhs} {rhs} |mapmode-t| *:tma* *:tmap* Map the key sequence {lhs} to {rhs} for the modes where the map command applies. The result, including {rhs}, is then further scanned for mappings. This @@ -89,7 +89,7 @@ modes. :iu[nmap] {lhs} |mapmode-i| *:iu* *:iunmap* :lu[nmap] {lhs} |mapmode-l| *:lu* *:lunmap* :cu[nmap] {lhs} |mapmode-c| *:cu* *:cunmap* -:tu[nmap] {lhs} |mapmode-t| *:tu* *:tunmap* +:tu[nmap] {lhs} |mapmode-t| *:tunma* *:tunmap* Remove the mapping of {lhs} for the modes where the map command applies. The mapping may remain defined for other modes where it applies. @@ -429,7 +429,7 @@ When listing mappings the characters in the first two columns are: i Insert l ":lmap" mappings for Insert, Command-line and Lang-Arg c Command-line - t Terminal-Job + t Terminal-Job Just before the {rhs} a special character can appear: * indicates that it is not remappable 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, |