Permalink
Browse files

patch 7.4.2209

Problem:    Cannot map <M-">. (Stephen Riehm)
Solution:   Solve the memory access problem in another way. (Dominique Pelle)
            Allow for using <M-\"> in a string.
  • Loading branch information...
1 parent 2d1a248 commit 35a4cfa200917dd171b1fff3cd5b6cee9add673d @brammool brammool committed Aug 14, 2016
Showing with 43 additions and 22 deletions.
  1. +6 −3 src/eval.c
  2. +1 −1 src/gui_mac.c
  3. +21 −13 src/misc2.c
  4. +1 −1 src/option.c
  5. +2 −2 src/proto/misc2.pro
  6. +1 −1 src/syntax.c
  7. +1 −1 src/term.c
  8. +8 −0 src/testdir/test_mapping.vim
  9. +2 −0 src/version.c
View
@@ -233,8 +233,6 @@ static int get_string_tv(char_u **arg, typval_T *rettv, int evaluate);
static int get_lit_string_tv(char_u **arg, typval_T *rettv, int evaluate);
static int free_unref_items(int copyID);
static int get_env_tv(char_u **arg, typval_T *rettv, int evaluate);
-
-
static int get_env_len(char_u **arg);
static char_u * make_expanded_name(char_u *in_start, char_u *expr_start, char_u *expr_end, char_u *in_end);
static void check_vars(char_u *name, int len);
@@ -4926,7 +4924,7 @@ get_string_tv(char_u **arg, typval_T *rettv, int evaluate)
break;
/* Special key, e.g.: "\<C-W>" */
- case '<': extra = trans_special(&p, name, TRUE);
+ case '<': extra = trans_special(&p, name, TRUE, TRUE);
if (extra != 0)
{
name += extra;
@@ -4943,6 +4941,11 @@ get_string_tv(char_u **arg, typval_T *rettv, int evaluate)
}
*name = NUL;
+ if (p == NUL)
+ {
+ EMSG2(_("E114: Missing quote: %s"), *arg);
+ return FAIL;
+ }
*arg = p + 1;
return OK;
View
@@ -4830,7 +4830,7 @@ gui_mch_add_menu_item(vimmenu_T *menu, int idx)
char_u *p_actext;
p_actext = menu->actext;
- key = find_special_key(&p_actext, &modifiers, FALSE, FALSE);
+ key = find_special_key(&p_actext, &modifiers, FALSE, FALSE, FALSE);
if (*p_actext != 0)
key = 0; /* error: trailing text */
/* find_special_key() returns a keycode with as many of the
View
@@ -2674,13 +2674,14 @@ get_special_key_name(int c, int modifiers)
trans_special(
char_u **srcp,
char_u *dst,
- int keycode) /* prefer key code, e.g. K_DEL instead of DEL */
+ int keycode, /* prefer key code, e.g. K_DEL instead of DEL */
+ int in_string) /* TRUE when inside a double quoted string */
{
int modifiers = 0;
int key;
int dlen = 0;
- key = find_special_key(srcp, &modifiers, keycode, FALSE);
+ key = find_special_key(srcp, &modifiers, keycode, FALSE, in_string);
if (key == 0)
return 0;
@@ -2720,7 +2721,8 @@ find_special_key(
char_u **srcp,
int *modp,
int keycode, /* prefer key code, e.g. K_DEL instead of DEL */
- int keep_x_key) /* don't translate xHome to Home key */
+ int keep_x_key, /* don't translate xHome to Home key */
+ int in_string) /* TRUE in string, double quote is escaped */
{
char_u *last_dash;
char_u *end_of_name;
@@ -2751,10 +2753,14 @@ find_special_key(
else
#endif
l = 1;
- /* Anything accepted, like <C-?>, except <C-">, because the "
- * ends the string. */
- if (bp[l] != '"' && bp[l + 1] == '>')
+ /* Anything accepted, like <C-?>.
+ * <C-"> or <M-"> are not special in strings as " is
+ * the string delimiter. With a backslash it works: <M-\"> */
+ if (!(in_string && bp[1] == '"') && bp[2] == '>')
bp += l;
+ else if (in_string && bp[1] == '\\' && bp[2] == '"'
+ && bp[3] == '>')
+ bp += 2;
}
}
if (bp[0] == 't' && bp[1] == '_' && bp[2] && bp[3])
@@ -2798,20 +2804,22 @@ find_special_key(
}
else
{
- /*
- * Modifier with single letter, or special key name.
- */
+ int off = 1;
+
+ /* Modifier with single letter, or special key name. */
+ if (in_string && last_dash[1] == '\\' && last_dash[2] == '"')
+ off = 2;
#ifdef FEAT_MBYTE
if (has_mbyte)
- l = mb_ptr2len(last_dash + 1);
+ l = mb_ptr2len(last_dash + off);
else
#endif
l = 1;
- if (modifiers != 0 && last_dash[l + 1] == '>')
- key = PTR2CHAR(last_dash + 1);
+ if (modifiers != 0 && last_dash[l + off] == '>')
+ key = PTR2CHAR(last_dash + off);
else
{
- key = get_special_key_code(last_dash + 1);
+ key = get_special_key_code(last_dash + off);
if (!keep_x_key)
key = handle_x_keys(key);
}
View
@@ -9478,7 +9478,7 @@ find_key_option(char_u *arg)
{
--arg; /* put arg at the '<' */
modifiers = 0;
- key = find_special_key(&arg, &modifiers, TRUE, TRUE);
+ key = find_special_key(&arg, &modifiers, TRUE, TRUE, FALSE);
if (modifiers) /* can't handle modifiers here */
key = 0;
}
View
@@ -64,8 +64,8 @@ int name_to_mod_mask(int c);
int simplify_key(int key, int *modifiers);
int handle_x_keys(int key);
char_u *get_special_key_name(int c, int modifiers);
-int trans_special(char_u **srcp, char_u *dst, int keycode);
-int find_special_key(char_u **srcp, int *modp, int keycode, int keep_x_key);
+int trans_special(char_u **srcp, char_u *dst, int keycode, int in_string);
+int find_special_key(char_u **srcp, int *modp, int keycode, int keep_x_key, int in_string);
int extract_modifiers(int key, int *modp);
int find_special_key_in_table(int c);
int get_special_key_code(char_u *name);
View
@@ -7939,7 +7939,7 @@ do_highlight(
*/
for (p = arg, off = 0; off < 100 - 6 && *p; )
{
- len = trans_special(&p, buf + off, FALSE);
+ len = trans_special(&p, buf + off, FALSE, FALSE);
if (len > 0) /* recognized special char */
off += len;
else /* copy as normal char */
View
@@ -5429,7 +5429,7 @@ replace_termcodes(
}
#endif
- slen = trans_special(&src, result + dlen, TRUE);
+ slen = trans_special(&src, result + dlen, TRUE, FALSE);
if (slen)
{
dlen += slen;
@@ -98,3 +98,11 @@ func Test_break_undo()
call assert_equal('new line here', getline(line('$') - 1))
set nomodified
endfunc
+
+func Test_map_meta_quotes()
+ imap <M-"> foo
+ call feedkeys("Go-\<M-\">-\<Esc>", "xt")
+ call assert_equal("-foo-", getline('$'))
+ set nomodified
+ iunmap <M-">
+endfunc
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2209,
+/**/
2208,
/**/
2207,

0 comments on commit 35a4cfa

Please sign in to comment.