From d555e44219f14477fbd066d0633aa5ab5912a509 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Thu, 27 Jun 2019 07:46:33 -0400
Subject: 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
---
 runtime/doc/map.txt  |  5 +++--
 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
@@ -2798,6 +2798,12 @@ return {
     addr_type=ADDR_LINES,
     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),
@@ -2810,12 +2816,6 @@ return {
     addr_type=ADDR_LINES,
     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),
@@ -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',
-- 
cgit