mirror of
https://github.com/vim/vim.git
synced 2025-11-14 23:04:02 -05:00
patch 9.1.1896: tests: patch v9.1.1895 breaks CI
Problem: tests: patch v9.1.1895 breaks CI, by failing screen dump tests
test_listlbr_utf8, test_diffmode and test_cmdline
Solution: Revert it
Revert "patch 9.1.1895: OSC terminal response hard to detect"
This reverts commit 8707b7a15b.
related: #18660
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
*intro.txt* For Vim version 9.1. Last change: 2025 Nov 01
|
*intro.txt* For Vim version 9.1. Last change: 2025 Oct 12
|
||||||
|
|
||||||
|
|
||||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||||
@@ -450,8 +450,6 @@ notation meaning equivalent decimal value(s) ~
|
|||||||
<Del> delete 127
|
<Del> delete 127
|
||||||
<CSI> command sequence intro ALT-Esc 155 *<CSI>*
|
<CSI> command sequence intro ALT-Esc 155 *<CSI>*
|
||||||
<xCSI> CSI when typed in the GUI *<xCSI>*
|
<xCSI> CSI when typed in the GUI *<xCSI>*
|
||||||
<OSC> operating system command 157 *<OSC>*
|
|
||||||
<xOSC> finished OSC response *<xOSC>*
|
|
||||||
|
|
||||||
<EOL> end-of-line (can be <CR>, <NL> or <CR><NL>,
|
<EOL> end-of-line (can be <CR>, <NL> or <CR><NL>,
|
||||||
depends on system and 'fileformat') *<EOL>*
|
depends on system and 'fileformat') *<EOL>*
|
||||||
|
|||||||
@@ -3841,7 +3841,6 @@ $quote eval.txt /*$quote*
|
|||||||
<NL> motion.txt /*<NL>*
|
<NL> motion.txt /*<NL>*
|
||||||
<Nop> map.txt /*<Nop>*
|
<Nop> map.txt /*<Nop>*
|
||||||
<Nul> intro.txt /*<Nul>*
|
<Nul> intro.txt /*<Nul>*
|
||||||
<OSC> intro.txt /*<OSC>*
|
|
||||||
<PageDown> scroll.txt /*<PageDown>*
|
<PageDown> scroll.txt /*<PageDown>*
|
||||||
<PageUp> scroll.txt /*<PageUp>*
|
<PageUp> scroll.txt /*<PageUp>*
|
||||||
<Plug> map.txt /*<Plug>*
|
<Plug> map.txt /*<Plug>*
|
||||||
@@ -3962,7 +3961,6 @@ $quote eval.txt /*$quote*
|
|||||||
<xHome> term.txt /*<xHome>*
|
<xHome> term.txt /*<xHome>*
|
||||||
<xHome>-xterm term.txt /*<xHome>-xterm*
|
<xHome>-xterm term.txt /*<xHome>-xterm*
|
||||||
<xLeft> term.txt /*<xLeft>*
|
<xLeft> term.txt /*<xLeft>*
|
||||||
<xOSC> intro.txt /*<xOSC>*
|
|
||||||
<xRight> term.txt /*<xRight>*
|
<xRight> term.txt /*<xRight>*
|
||||||
<xUp> term.txt /*<xUp>*
|
<xUp> term.txt /*<xUp>*
|
||||||
= change.txt /*=*
|
= change.txt /*=*
|
||||||
|
|||||||
@@ -280,7 +280,6 @@ enum key_extra
|
|||||||
, KE_SID = 106 // <SID> special key, followed by {nr};
|
, KE_SID = 106 // <SID> special key, followed by {nr};
|
||||||
, KE_ESC = 107 // used for K_ESC
|
, KE_ESC = 107 // used for K_ESC
|
||||||
, KE_WILD = 108 // triggers wildmode completion
|
, KE_WILD = 108 // triggers wildmode completion
|
||||||
, KE_OSC = 109 // OSC sequence
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -479,7 +478,6 @@ enum key_extra
|
|||||||
#define K_MOUSERIGHT TERMCAP2KEY(KS_EXTRA, KE_MOUSERIGHT)
|
#define K_MOUSERIGHT TERMCAP2KEY(KS_EXTRA, KE_MOUSERIGHT)
|
||||||
|
|
||||||
#define K_CSI TERMCAP2KEY(KS_EXTRA, KE_CSI)
|
#define K_CSI TERMCAP2KEY(KS_EXTRA, KE_CSI)
|
||||||
#define K_OSC TERMCAP2KEY(KS_EXTRA, KE_OSC)
|
|
||||||
#define K_SNR TERMCAP2KEY(KS_EXTRA, KE_SNR)
|
#define K_SNR TERMCAP2KEY(KS_EXTRA, KE_SNR)
|
||||||
#define K_PLUG TERMCAP2KEY(KS_EXTRA, KE_PLUG)
|
#define K_PLUG TERMCAP2KEY(KS_EXTRA, KE_PLUG)
|
||||||
#define K_CMDWIN TERMCAP2KEY(KS_EXTRA, KE_CMDWIN)
|
#define K_CMDWIN TERMCAP2KEY(KS_EXTRA, KE_CMDWIN)
|
||||||
|
|||||||
@@ -1053,7 +1053,6 @@ static struct key_name_entry
|
|||||||
{TRUE, NL, STRING_INIT("NewLine"), TRUE},
|
{TRUE, NL, STRING_INIT("NewLine"), TRUE},
|
||||||
{TRUE, NL, STRING_INIT("NL"), FALSE},
|
{TRUE, NL, STRING_INIT("NL"), FALSE},
|
||||||
{TRUE, K_ZERO, STRING_INIT("Nul"), FALSE},
|
{TRUE, K_ZERO, STRING_INIT("Nul"), FALSE},
|
||||||
{TRUE, OSC, STRING_INIT("OSC"), FALSE},
|
|
||||||
{TRUE, K_PAGEDOWN, STRING_INIT("PageDown"), FALSE},
|
{TRUE, K_PAGEDOWN, STRING_INIT("PageDown"), FALSE},
|
||||||
{TRUE, K_PAGEUP, STRING_INIT("PageUp"), FALSE},
|
{TRUE, K_PAGEUP, STRING_INIT("PageUp"), FALSE},
|
||||||
{TRUE, K_PE, STRING_INIT("PasteEnd"), FALSE},
|
{TRUE, K_PE, STRING_INIT("PasteEnd"), FALSE},
|
||||||
@@ -1112,7 +1111,6 @@ static struct key_name_entry
|
|||||||
{TRUE, K_XF4, STRING_INIT("xF4"), FALSE},
|
{TRUE, K_XF4, STRING_INIT("xF4"), FALSE},
|
||||||
{TRUE, K_XHOME, STRING_INIT("xHome"), FALSE},
|
{TRUE, K_XHOME, STRING_INIT("xHome"), FALSE},
|
||||||
{TRUE, K_XLEFT, STRING_INIT("xLeft"), FALSE},
|
{TRUE, K_XLEFT, STRING_INIT("xLeft"), FALSE},
|
||||||
{TRUE, K_OSC, STRING_INIT("xOSC"), FALSE},
|
|
||||||
{TRUE, K_XRIGHT, STRING_INIT("xRight"), FALSE},
|
{TRUE, K_XRIGHT, STRING_INIT("xRight"), FALSE},
|
||||||
{TRUE, K_XUP, STRING_INIT("xUp"), FALSE},
|
{TRUE, K_XUP, STRING_INIT("xUp"), FALSE},
|
||||||
{TRUE, K_ZEND, STRING_INIT("zEnd"), FALSE},
|
{TRUE, K_ZEND, STRING_INIT("zEnd"), FALSE},
|
||||||
|
|||||||
@@ -5933,6 +5933,7 @@ handle_osc(char_u *tp, int len, char_u *key_name, int *slen)
|
|||||||
last_char = ((char_u *)osc_state.buf.ga_data)[osc_state.buf.ga_len - 1];
|
last_char = ((char_u *)osc_state.buf.ga_data)[osc_state.buf.ga_len - 1];
|
||||||
|
|
||||||
key_name[0] = (int)KS_EXTRA;
|
key_name[0] = (int)KS_EXTRA;
|
||||||
|
key_name[1] = (int)KE_IGNORE;
|
||||||
|
|
||||||
// Read data and append to buffer. If we reach a terminator, then
|
// Read data and append to buffer. If we reach a terminator, then
|
||||||
// finally set the vim var.
|
// finally set the vim var.
|
||||||
@@ -5944,8 +5945,6 @@ handle_osc(char_u *tp, int len, char_u *key_name, int *slen)
|
|||||||
{
|
{
|
||||||
osc_state.processing = FALSE;
|
osc_state.processing = FALSE;
|
||||||
|
|
||||||
key_name[1] = (int)KE_OSC;
|
|
||||||
|
|
||||||
ga_concat_len(&osc_state.buf, tp, i + 1 + (tp[i] == ESC));
|
ga_concat_len(&osc_state.buf, tp, i + 1 + (tp[i] == ESC));
|
||||||
ga_append(&osc_state.buf, NUL);
|
ga_append(&osc_state.buf, NUL);
|
||||||
*slen = i + 1 + (tp[i] == ESC);
|
*slen = i + 1 + (tp[i] == ESC);
|
||||||
@@ -5963,8 +5962,6 @@ handle_osc(char_u *tp, int len, char_u *key_name, int *slen)
|
|||||||
return OK;
|
return OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
key_name[1] = (int)KE_IGNORE;
|
|
||||||
|
|
||||||
#ifdef ELAPSED_FUNC
|
#ifdef ELAPSED_FUNC
|
||||||
if (ELAPSED_FUNC(osc_state.start_tv) >= p_ost)
|
if (ELAPSED_FUNC(osc_state.start_tv) >= p_ost)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -729,6 +729,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 */
|
||||||
|
/**/
|
||||||
|
1896,
|
||||||
/**/
|
/**/
|
||||||
1895,
|
1895,
|
||||||
/**/
|
/**/
|
||||||
|
|||||||
Reference in New Issue
Block a user