patch 9.0.1516: cannot use special keys in <Cmd> mapping

Problem:    Cannot use special keys in <Cmd> mapping.
Solution:   Do allow for special keys in <Cmd> and <ScriptCmd> mappings.
            (closes #12326)

diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index fb92ea34c34fd9e5440fec6d1c06621a935fdb90..8f2fe7573458bd8c8d28e5935ebf59bd38be90fc 100644 (file)
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -408,10 +408,6 @@ Note:
 by <CR> in the {rhs} of the mapping definition.  |Command-line| mode is never
 entered.
 
-                                                       *E1137*
-<Cmd> and <ScriptCmd> commands can have only normal characters and cannot
-contain special characters like function keys.
-
 
 1.3 MAPPING AND MODES                                  *:map-modes*
                        *mapmode-nvo* *mapmode-n* *mapmode-v* *mapmode-o*

diff --git a/src/errors.h b/src/errors.h
index bbfe6bb87c3550a174b74416c292ee0d7849cf65..12f187afbd2c614972bedc2f55e7611c27be02a1 100644 (file)
--- a/src/errors.h
+++ b/src/errors.h
@@ -2894,8 +2894,7 @@ EXTERN char e_using_string_as_bool_str[]
 #endif
 EXTERN char e_cmd_mapping_must_end_with_cr_before_second_cmd[]
        INIT(= N_("E1136: <Cmd> mapping must end with <CR> before second <Cmd>"));
-EXTERN char e_cmd_mapping_must_not_include_str_key[]
-       INIT(= N_("E1137: <Cmd> mapping must not include %s key"));
+// E1137 unused
 #ifdef FEAT_EVAL
 EXTERN char e_using_bool_as_number[]
        INIT(= N_("E1138: Using a Bool as a Number"));

diff --git a/src/getchar.c b/src/getchar.c
index 6817fa5b83590effdaa62a75697b9d90a8c394f7..d510e45d91c551b50e7b06dfdefcd59d1149af91 100644 (file)
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -602,6 +602,26 @@ AppendToRedobuffLit(
     }
 }
 
+/*
+ * Append "s" to the redo buffer, leaving 3-byte special key codes unmodified
+ * and escaping other K_SPECIAL and CSI bytes.
+ */
+    void
+AppendToRedobuffSpec(char_u *s)
+{
+    while (*s != NUL)
+    {
+       if (*s == K_SPECIAL && s[1] != NUL && s[2] != NUL)
+       {
+           // insert special key literally
+           add_buff(&redobuff, s, 3L);
+           s += 3;
+       }
+       else
+           add_char_buff(&redobuff, mb_cptr2char_adv(&s));
+    }
+}
+
 /*
  * Append a character to the redo buffer.
  * Translates special keys, NUL, CSI, K_SPECIAL and multibyte characters.
@@ -3941,14 +3961,6 @@ getcmdkeycmd(
            if (c1 == K_ESC)
                c1 = ESC;
        }
-       if (c1 == Ctrl_V)
-       {
-           // CTRL-V is followed by octal, hex or other characters, reverses
-           // what AppendToRedobuffLit() does.
-           ++no_reduce_keys;  //  don't merge modifyOtherKeys
-           c1 = get_literal(TRUE);
-           --no_reduce_keys;
-       }
 
        if (got_int)
            aborted = TRUE;
@@ -3962,19 +3974,27 @@ getcmdkeycmd(
            emsg(_(e_cmd_mapping_must_end_with_cr_before_second_cmd));
            aborted = TRUE;
        }
-       else if (IS_SPECIAL(c1))
+       else if (c1 == K_SNR)
        {
-           if (c1 == K_SNR)
-               ga_concat(&line_ga, (char_u *)"<SNR>");
-           else
+           ga_concat(&line_ga, (char_u *)"<SNR>");
+       }
+       else
+       {
+           if (cmod != 0)
+           {
+               ga_append(&line_ga, K_SPECIAL);
+               ga_append(&line_ga, KS_MODIFIER);
+               ga_append(&line_ga, cmod);
+           }
+           if (IS_SPECIAL(c1))
            {
-               semsg(e_cmd_mapping_must_not_include_str_key,
-                                              get_special_key_name(c1, cmod));
-               aborted = TRUE;
+               ga_append(&line_ga, K_SPECIAL);
+               ga_append(&line_ga, K_SECOND(c1));
+               ga_append(&line_ga, K_THIRD(c1));
            }
+           else
+               ga_append(&line_ga, c1);
        }
-       else
-           ga_append(&line_ga, c1);
 
        cmod = 0;
     }

diff --git a/src/ops.c b/src/ops.c
index 33fedba05a47f003abbcbf2ccd2f24aa2786903f..4c64e05b2cbacecd4800cc452ad433f484b8bbaf 100644 (file)
--- a/src/ops.c
+++ b/src/ops.c
@@ -3701,7 +3701,7 @@ do_pending_operator(cmdarg_T *cap, int old_col, int gui_yank)
                    ResetRedobuff();
                else
                {
-                   AppendToRedobuffLit(repeat_cmdline, -1);
+                   AppendToRedobuffSpec(repeat_cmdline);
                    AppendToRedobuff(NL_STR);
                    VIM_CLEAR(repeat_cmdline);
                }

diff --git a/src/proto/getchar.pro b/src/proto/getchar.pro
index 66c1e9b72dec32f6ec642da7a7cca47b13835a3b..01746cf700acf7355318f724bb55173d040870b1 100644 (file)
--- a/src/proto/getchar.pro
+++ b/src/proto/getchar.pro
@@ -11,6 +11,7 @@ void saveRedobuff(save_redo_T *save_redo);
 void restoreRedobuff(save_redo_T *save_redo);
 void AppendToRedobuff(char_u *s);
 void AppendToRedobuffLit(char_u *str, int len);
+void AppendToRedobuffSpec(char_u *s);
 void AppendCharToRedobuff(int c);
 void AppendNumberToRedobuff(long n);
 void stuffReadbuff(char_u *s);

diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim
index b1dd4446ab547f855baac7e22a2fbecd8faa5b46..f9c21bb0735ef3263153f4b2bb5173d785fa873d 100644 (file)
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -1001,10 +1001,6 @@ func Test_map_cmdkey()
   call assert_fails('call feedkeys("\<F3>", "xt")', 'E1136:')
   call assert_equal(0, x)
 
-  noremap <F3> <Cmd><F3>let x = 2<CR>
-  call assert_fails('call feedkeys("\<F3>", "xt")', 'E1137:')
-  call assert_equal(0, x)
-
   noremap <F3> <Cmd>let x = 3
   call assert_fails('call feedkeys("\<F3>", "xt!")', 'E1255:')
   call assert_equal(0, x)
@@ -1104,11 +1100,6 @@ func Test_map_cmdkey()
   unmap <F3>
   unmap! <F3>
   %bw!
-
-  " command line ending in "0" is handled without errors
-  onoremap ix <cmd>eval 0<cr>
-  call feedkeys('dix.', 'xt')
-  ounmap ix
 endfunc
 
 " text object enters visual mode
@@ -1495,6 +1486,24 @@ func Test_map_cmdkey_redo()
   call delete('Xcmdtext')
   delfunc SelectDash
   ounmap i-
+
+  new
+  call setline(1, 'aaa bbb ccc ddd')
+
+  " command can contain special keys
+  onoremap ix <Cmd>let g:foo ..= '…'<Bar>normal! <C-Right><CR>
+  let g:foo = ''
+  call feedkeys('0dix.', 'xt')
+  call assert_equal('……', g:foo)
+  call assert_equal('ccc ddd', getline(1))
+  unlet g:foo
+
+  " command line ending in "0" is handled without errors
+  onoremap ix <Cmd>eval 0<CR>
+  call feedkeys('dix.', 'xt')
+
+  ounmap ix
+  bwipe!
 endfunc
 
 func Test_map_script_cmd_restore()

diff --git a/src/version.c b/src/version.c
index 8ec68dec76f6c6ea248e4838182abe058d17de47..260afa8eca4e60758eada3b97f0f324a96dea512 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1516,
 /**/
     1515,
 /**/