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 #2102)

diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 88fb622009f22038c4a4b293fb5975ed9cb0324c..fcba510cbdf357a201f4c9c806da495b07bd34ac 100644 (file)
--- 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 0cc279dabcc7aff434d972fa25663c0c60af726f..41c7c80cb7b53a443cb921cb2f7d7d9ba33ff09a 100644 (file)
--- 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 893de43ac6651032b73dacecb2ef786563338075..dae5d3f081789730b6ee15f400597d2d14a035fb 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1120,
 /**/
     1119,
 /**/