diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-06-27 07:46:33 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-06-27 07:59:49 -0400 |
| commit | d555e44219f14477fbd066d0633aa5ab5912a509 (patch) | |
| tree | 5bcbbffabc7896eaf6696518f07b1a6ca8ac12de | |
| parent | 2b400daca38b69e9d1dc76d97fa9391e2764b400 (diff) | |
| download | rneovim-d555e44219f14477fbd066d0633aa5ab5912a509.tar.gz rneovim-d555e44219f14477fbd066d0633aa5ab5912a509.tar.bz2 rneovim-d555e44219f14477fbd066d0633aa5ab5912a509.zip | |
vim-patch:8.0.1120: :tm means :tmap instead of :tmenu
Problem: :tm means :tmap instead of :tmenu. (Taro Muraoka)
Solution: Move the new entry below the old entry. (closes vim/vim#2102)
https://github.com/vim/vim/commit/63c4e8a1986796094e6f15b893f2deccdf482617
| -rw-r--r-- | runtime/doc/map.txt | 5 | ||||
| -rw-r--r-- | src/nvim/ex_cmds.lua | 20 |
2 files changed, 13 insertions, 12 deletions
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index eac42df791..74c9a2a003 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -438,6 +438,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 Just before the {rhs} a special character can appear: * indicates that it is not remappable @@ -536,9 +537,9 @@ scenario: > :imap <M-C> foo :set encoding=utf-8 The mapping for <M-C> is defined with the latin1 encoding, resulting in a 0xc3 -byte. If you type the character á (0xe1 <M-a>) in UTF-8 encoding this is the +byte. If you type the character á (0xe1 <M-a>) in UTF-8 encoding this is the two bytes 0xc3 0xa1. You don't want the 0xc3 byte to be mapped then or -otherwise it would be impossible to type the á character. +otherwise it would be impossible to type the á character. *<Leader>* *mapleader* To define a mapping which uses the "mapleader" variable, the special string diff --git a/src/nvim/ex_cmds.lua b/src/nvim/ex_cmds.lua index 58dc62e953..b1739b9e67 100644 --- a/src/nvim/ex_cmds.lua +++ b/src/nvim/ex_cmds.lua @@ -2799,6 +2799,12 @@ return { func='ex_tag', }, { + command='tmenu', + flags=bit.bor(RANGE, NOTADR, ZEROR, EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN), + addr_type=ADDR_LINES, + func='ex_menu', + }, + { command='tmap', flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN), addr_type=ADDR_LINES, @@ -2811,12 +2817,6 @@ return { func='ex_mapclear', }, { - command='tmenu', - flags=bit.bor(RANGE, NOTADR, ZEROR, EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN), - addr_type=ADDR_LINES, - func='ex_menu', - }, - { command='tnext', flags=bit.bor(RANGE, NOTADR, BANG, TRLBAR, ZEROR), addr_type=ADDR_LINES, @@ -2859,16 +2859,16 @@ return { func='ex_tag', }, { - command='tunmap', + command='tunmenu', flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN), addr_type=ADDR_LINES, - func='ex_unmap', + func='ex_menu', }, { - command='tunmenu', + command='tunmap', flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN), addr_type=ADDR_LINES, - func='ex_menu', + func='ex_unmap', }, { command='undo', |