aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.0.1120: :tm means :tmap instead of :tmenu

Browse Source 
Problem:    :tm means :tmap instead of :tmenu. (Taro Muraoka)
Solution:   Move the new entry below the old entry. (closes #2102)
This commit is contained in:
Bram Moolenaar 2017-09-17 20:32:20 +02:00
parent 8adb0d03ca
commit 63c4e8a198
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/doc/map.txt
View File

@ -55,7 +55,7 @@ modes.
:im[ap] {lhs} {rhs} |mapmode-i| *:im* *:imap* :im[ap] {lhs} {rhs} |mapmode-i| *:im* *:imap*
:lm[ap] {lhs} {rhs} |mapmode-l| *:lm* *:lmap* :lm[ap] {lhs} {rhs} |mapmode-l| *:lm* *:lmap*
:cm[ap] {lhs} {rhs} |mapmode-c| *:cm* *:cmap* :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 Map the key sequence {lhs} to {rhs} for the modes
where the map command applies. The result, including where the map command applies. The result, including
{rhs}, is then further scanned for mappings. This {rhs}, is then further scanned for mappings. This
@ -89,7 +89,7 @@ modes.
:iu[nmap] {lhs} |mapmode-i| *:iu* *:iunmap* :iu[nmap] {lhs} |mapmode-i| *:iu* *:iunmap*
:lu[nmap] {lhs} |mapmode-l| *:lu* *:lunmap* :lu[nmap] {lhs} |mapmode-l| *:lu* *:lunmap*
:cu[nmap] {lhs} |mapmode-c| *:cu* *:cunmap* :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 Remove the mapping of {lhs} for the modes where the
map command applies. The mapping may remain defined map command applies. The mapping may remain defined
for other modes where it applies. for other modes where it applies.
@ -429,7 +429,7 @@ When listing mappings the characters in the first two columns are:
i Insert i Insert
l ":lmap" mappings for Insert, Command-line and Lang-Arg l ":lmap" mappings for Insert, Command-line and Lang-Arg
c Command-line c Command-line
t Terminal-Job t Terminal-Job
Just before the {rhs} a special character can appear: Just before the {rhs} a special character can appear:
* indicates that it is not remappable * indicates that it is not remappable

10
src/ex_cmds.h
View File

@ -1498,15 +1498,15 @@ EX(CMD_tjump, "tjump", ex_tag,
EX(CMD_tlast, "tlast", ex_tag, EX(CMD_tlast, "tlast", ex_tag,
BANG|TRLBAR, BANG|TRLBAR,
ADDR_LINES), ADDR_LINES),
EX(CMD_tmenu, "tmenu", ex_menu,
RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
ADDR_LINES),
EX(CMD_tmap, "tmap", ex_map, EX(CMD_tmap, "tmap", ex_map,
EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN, EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
ADDR_LINES), ADDR_LINES),
EX(CMD_tmapclear, "tmapclear", ex_mapclear, EX(CMD_tmapclear, "tmapclear", ex_mapclear,
EXTRA|TRLBAR|CMDWIN, EXTRA|TRLBAR|CMDWIN,
ADDR_LINES), ADDR_LINES),
EX(CMD_tmenu, "tmenu", ex_menu,
RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
ADDR_LINES),
EX(CMD_tnext, "tnext", ex_tag, EX(CMD_tnext, "tnext", ex_tag,
RANGE|NOTADR|BANG|TRLBAR|ZEROR, RANGE|NOTADR|BANG|TRLBAR|ZEROR,
ADDR_LINES), ADDR_LINES),
@ -1528,10 +1528,10 @@ EX(CMD_try, "try", ex_try,
EX(CMD_tselect, "tselect", ex_tag, EX(CMD_tselect, "tselect", ex_tag,
BANG|TRLBAR|WORD1, BANG|TRLBAR|WORD1,
ADDR_LINES), ADDR_LINES),
EX(CMD_tunmap, "tunmap", ex_unmap, EX(CMD_tunmenu, "tunmenu", ex_menu,
EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN, EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
ADDR_LINES), ADDR_LINES),
EX(CMD_tunmenu, "tunmenu", ex_menu, EX(CMD_tunmap, "tunmap", ex_unmap,
EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN, EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
ADDR_LINES), ADDR_LINES),
EX(CMD_undo, "undo", ex_undo, EX(CMD_undo, "undo", ex_undo,

2
src/version.c
View File

@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1120,
/**/ /**/
1119, 1119,
/**/ /**/