mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
updated for version 7.3.138
Problem: ":com" changes the multi-byte text of :echo. (Dimitar Dimitrov) Solution: Search for K_SPECIAL as a byte, not a character. (Ben Schmidt)
This commit is contained in:
parent
6eb634ef1f
commit
f63c49d4e9
@ -6054,15 +6054,17 @@ do_ucmd(eap)
|
|||||||
end = vim_strchr(start + 1, '>');
|
end = vim_strchr(start + 1, '>');
|
||||||
if (buf != NULL)
|
if (buf != NULL)
|
||||||
{
|
{
|
||||||
ksp = vim_strchr(p, K_SPECIAL);
|
for (ksp = p; *ksp != NUL && *ksp != K_SPECIAL; ++ksp)
|
||||||
if (ksp != NULL && (start == NULL || ksp < start || end == NULL)
|
;
|
||||||
|
if (*ksp == K_SPECIAL
|
||||||
|
&& (start == NULL || ksp < start || end == NULL)
|
||||||
&& ((ksp[1] == KS_SPECIAL && ksp[2] == KE_FILLER)
|
&& ((ksp[1] == KS_SPECIAL && ksp[2] == KE_FILLER)
|
||||||
# ifdef FEAT_GUI
|
# ifdef FEAT_GUI
|
||||||
|| (ksp[1] == KS_EXTRA && ksp[2] == (int)KE_CSI)
|
|| (ksp[1] == KS_EXTRA && ksp[2] == (int)KE_CSI)
|
||||||
# endif
|
# endif
|
||||||
))
|
))
|
||||||
{
|
{
|
||||||
/* K_SPECIAL han been put in the buffer as K_SPECIAL
|
/* K_SPECIAL has been put in the buffer as K_SPECIAL
|
||||||
* KS_SPECIAL KE_FILLER, like for mappings, but
|
* KS_SPECIAL KE_FILLER, like for mappings, but
|
||||||
* do_cmdline() doesn't handle that, so convert it back.
|
* do_cmdline() doesn't handle that, so convert it back.
|
||||||
* Also change K_SPECIAL KS_EXTRA KE_CSI into CSI. */
|
* Also change K_SPECIAL KS_EXTRA KE_CSI into CSI. */
|
||||||
|
@ -714,6 +714,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
138,
|
||||||
/**/
|
/**/
|
||||||
137,
|
137,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user