Skip to content

Commit 1ead1b5

Browse files
committed
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 8707b7a. related: #18660 Signed-off-by: Christian Brabandt <cb@256bit.org>
1 parent 213109a commit 1ead1b5

File tree

6 files changed

+4
-13
lines changed

6 files changed

+4
-13
lines changed

runtime/doc/intro.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*intro.txt* For Vim version 9.1. Last change: 2025 Nov 01
1+
*intro.txt* For Vim version 9.1. Last change: 2025 Oct 12
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -450,8 +450,6 @@ notation meaning equivalent decimal value(s) ~
450450
<Del> delete 127
451451
<CSI> command sequence intro ALT-Esc 155 *<CSI>*
452452
<xCSI> CSI when typed in the GUI *<xCSI>*
453-
<OSC> operating system command 157 *<OSC>*
454-
<xOSC> finished OSC response *<xOSC>*
455453

456454
<EOL> end-of-line (can be <CR>, <NL> or <CR><NL>,
457455
depends on system and 'fileformat') *<EOL>*

runtime/doc/tags

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3841,7 +3841,6 @@ $quote eval.txt /*$quote*
38413841
<NL> motion.txt /*<NL>*
38423842
<Nop> map.txt /*<Nop>*
38433843
<Nul> intro.txt /*<Nul>*
3844-
<OSC> intro.txt /*<OSC>*
38453844
<PageDown> scroll.txt /*<PageDown>*
38463845
<PageUp> scroll.txt /*<PageUp>*
38473846
<Plug> map.txt /*<Plug>*
@@ -3962,7 +3961,6 @@ $quote eval.txt /*$quote*
39623961
<xHome> term.txt /*<xHome>*
39633962
<xHome>-xterm term.txt /*<xHome>-xterm*
39643963
<xLeft> term.txt /*<xLeft>*
3965-
<xOSC> intro.txt /*<xOSC>*
39663964
<xRight> term.txt /*<xRight>*
39673965
<xUp> term.txt /*<xUp>*
39683966
= change.txt /*=*

src/keymap.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@ enum key_extra
280280
, KE_SID = 106 // <SID> special key, followed by {nr};
281281
, KE_ESC = 107 // used for K_ESC
282282
, KE_WILD = 108 // triggers wildmode completion
283-
, KE_OSC = 109 // OSC sequence
284283
};
285284

286285
/*
@@ -479,7 +478,6 @@ enum key_extra
479478
#define K_MOUSERIGHT TERMCAP2KEY(KS_EXTRA, KE_MOUSERIGHT)
480479

481480
#define K_CSI TERMCAP2KEY(KS_EXTRA, KE_CSI)
482-
#define K_OSC TERMCAP2KEY(KS_EXTRA, KE_OSC)
483481
#define K_SNR TERMCAP2KEY(KS_EXTRA, KE_SNR)
484482
#define K_PLUG TERMCAP2KEY(KS_EXTRA, KE_PLUG)
485483
#define K_CMDWIN TERMCAP2KEY(KS_EXTRA, KE_CMDWIN)

src/misc2.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,6 @@ static struct key_name_entry
10531053
{TRUE, NL, STRING_INIT("NewLine"), TRUE},
10541054
{TRUE, NL, STRING_INIT("NL"), FALSE},
10551055
{TRUE, K_ZERO, STRING_INIT("Nul"), FALSE},
1056-
{TRUE, OSC, STRING_INIT("OSC"), FALSE},
10571056
{TRUE, K_PAGEDOWN, STRING_INIT("PageDown"), FALSE},
10581057
{TRUE, K_PAGEUP, STRING_INIT("PageUp"), FALSE},
10591058
{TRUE, K_PE, STRING_INIT("PasteEnd"), FALSE},
@@ -1112,7 +1111,6 @@ static struct key_name_entry
11121111
{TRUE, K_XF4, STRING_INIT("xF4"), FALSE},
11131112
{TRUE, K_XHOME, STRING_INIT("xHome"), FALSE},
11141113
{TRUE, K_XLEFT, STRING_INIT("xLeft"), FALSE},
1115-
{TRUE, K_OSC, STRING_INIT("xOSC"), FALSE},
11161114
{TRUE, K_XRIGHT, STRING_INIT("xRight"), FALSE},
11171115
{TRUE, K_XUP, STRING_INIT("xUp"), FALSE},
11181116
{TRUE, K_ZEND, STRING_INIT("zEnd"), FALSE},

src/term.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5933,6 +5933,7 @@ handle_osc(char_u *tp, int len, char_u *key_name, int *slen)
59335933
last_char = ((char_u *)osc_state.buf.ga_data)[osc_state.buf.ga_len - 1];
59345934

59355935
key_name[0] = (int)KS_EXTRA;
5936+
key_name[1] = (int)KE_IGNORE;
59365937

59375938
// Read data and append to buffer. If we reach a terminator, then
59385939
// finally set the vim var.
@@ -5944,8 +5945,6 @@ handle_osc(char_u *tp, int len, char_u *key_name, int *slen)
59445945
{
59455946
osc_state.processing = FALSE;
59465947

5947-
key_name[1] = (int)KE_OSC;
5948-
59495948
ga_concat_len(&osc_state.buf, tp, i + 1 + (tp[i] == ESC));
59505949
ga_append(&osc_state.buf, NUL);
59515950
*slen = i + 1 + (tp[i] == ESC);
@@ -5963,8 +5962,6 @@ handle_osc(char_u *tp, int len, char_u *key_name, int *slen)
59635962
return OK;
59645963
}
59655964

5966-
key_name[1] = (int)KE_IGNORE;
5967-
59685965
#ifdef ELAPSED_FUNC
59695966
if (ELAPSED_FUNC(osc_state.start_tv) >= p_ost)
59705967
{

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -729,6 +729,8 @@ static char *(features[]) =
729729

730730
static int included_patches[] =
731731
{ /* Add new patch number below this line */
732+
/**/
733+
1896,
732734
/**/
733735
1895,
734736
/**/

0 commit comments

Comments
 (0)