updated for version 7.3.141

Problem:    When a key code is not set get a confusing error message.
Solution:   Change the error message to say the key code is not set.

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 939a81d0078d032754043e99af4b7a6785f51f10..9b15c58d3f39552ac822153ee6be4fe454536d8b 100644 (file)
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -150,6 +150,18 @@ example, if Alt-b produces <Esc>b, use this: >
 (the ^[ is a real <Esc> here, use CTRL-V <Esc> to enter it)
 The advantage over a mapping is that it works in all situations.
 
+You can define any key codes, e.g.: >
+       :set t_xy=^[foo;
+There is no warning for using a name that isn't recognized.  You can map these
+codes as you like: >
+       :map <t_xy> something
+<                                                              *E846*
+When a key code is not set, it's like it does not exist.  Trying to get its
+value will result in an error: >
+       :set t_kb=
+       :set t_kb
+       E846: Key code not set: t_kb
+
 The t_xx options cannot be set from a |modeline| or in the |sandbox|, for
 security reasons.
 

diff --git a/src/option.c b/src/option.c
index f1fcd69d0fda2af02fa884ccb768d7b95b99dc68..b63346637a568cb9634a21877b0632101782dd5f 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -4352,7 +4352,7 @@ do_set(arg, opt_flags)
                    p = find_termcode(key_name);
                    if (p == NULL)
                    {
-                       errmsg = (char_u *)N_("E518: Unknown option");
+                       errmsg = (char_u *)N_("E846: Key code not set");
                        goto skip;
                    }
                    else
@@ -4700,8 +4700,8 @@ do_set(arg, opt_flags)
                                                || s[i] == ','
                                                || s[i] == NUL))
                                        break;
-                                   /* Count backspaces.  Only a comma with an
-                                    * even number of backspaces before it is
+                                   /* Count backslashes.  Only a comma with an
+                                    * even number of backslashes before it is
                                     * recognized as a separator */
                                    if (s > origval && s[-1] == '\\')
                                        ++bs;

diff --git a/src/version.c b/src/version.c
index d24bf7dba66fea3958439fa01bdb3ceeec0c0642..3505097fb5554385a5d65666465fc120d6f1529b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    141,
 /**/
     140,
 /**/