mirror of
https://github.com/neovim/neovim.git
synced 2025-10-03 08:28:34 +00:00
vim-patch:9.1.0762: 'cedit', 'termwinkey' and 'wildchar' may not be parsed correctly (#30704)
Problem: 'cedit', 'termwinkey' and 'wildchar' may not be parsed
correctly
Solution: improve string_to_key() function in option.c
(Milly)
- Problem: `^@` raises an error.
Solution: Store as `<Nul>`.
- Problem: `<t_xx` does not raise an error.
Solution: Raise an error if closing `>` is missing.
- Problem: Single `<` or `^` raises an error. It is inconvenient for users.
Solution: They are stored as a single character.
closes: vim/vim#15811
a9c6f90918
Co-authored-by: Milly <milly.ca@gmail.com>
This commit is contained in:
@@ -1525,7 +1525,9 @@ static int find_key_len(const char *arg_arg, size_t len, bool has_lt)
|
||||
// Don't use get_special_key_code() for t_xx, we don't want it to call
|
||||
// add_termcap_entry().
|
||||
if (len >= 4 && arg[0] == 't' && arg[1] == '_') {
|
||||
key = TERMCAP2KEY((uint8_t)arg[2], (uint8_t)arg[3]);
|
||||
if (!has_lt || arg[4] == '>') {
|
||||
key = TERMCAP2KEY((uint8_t)arg[2], (uint8_t)arg[3]);
|
||||
}
|
||||
} else if (has_lt) {
|
||||
arg--; // put arg at the '<'
|
||||
int modifiers = 0;
|
||||
@@ -1539,14 +1541,18 @@ static int find_key_len(const char *arg_arg, size_t len, bool has_lt)
|
||||
}
|
||||
|
||||
/// Convert a key name or string into a key value.
|
||||
/// Used for 'wildchar' and 'cedit' options.
|
||||
/// Used for 'cedit', 'wildchar' and 'wildcharm' options.
|
||||
int string_to_key(char *arg)
|
||||
{
|
||||
if (*arg == '<') {
|
||||
if (*arg == '<' && arg[1]) {
|
||||
return find_key_len(arg + 1, strlen(arg), true);
|
||||
}
|
||||
if (*arg == '^') {
|
||||
return CTRL_CHR((uint8_t)arg[1]);
|
||||
if (*arg == '^' && arg[1]) {
|
||||
int key = CTRL_CHR((uint8_t)arg[1]);
|
||||
if (key == 0) { // ^@ is <Nul>
|
||||
key = K_ZERO;
|
||||
}
|
||||
return key;
|
||||
}
|
||||
return (uint8_t)(*arg);
|
||||
}
|
||||
|
Reference in New Issue
Block a user