From 231b4fc3cc3cc84cad4babaf077b0fc13ece0932 Mon Sep 17 00:00:00 2001 From: Christian Brabandt Date: Sat, 28 Dec 2024 16:27:49 +0100 Subject: [PATCH] patch 9.1.0969: ghostty not using kitty protocol by default Problem: ghostty not using kitty protocol by default (00-kat) Solution: update keyprotocol option default and include ghostty fixes: #16318 closes: #16323 Signed-off-by: Christian Brabandt --- src/optiondefs.h | 2 +- src/testdir/test_options.vim | 7 +++++++ src/version.c | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/optiondefs.h b/src/optiondefs.h index 2d01897659..f9b7eae1ff 100644 --- a/src/optiondefs.h +++ b/src/optiondefs.h @@ -1514,7 +1514,7 @@ static struct vimoption options[] = {(char_u *)"", (char_u *)0L} SCTX_INIT}, {"keyprotocol", "kpc", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP|P_COLON, (char_u *)&p_kpc, PV_NONE, did_set_keyprotocol, expand_set_keyprotocol, - {(char_u *)"kitty:kitty,foot:kitty,wezterm:kitty,xterm:mok2", (char_u *)0L} + {(char_u *)"kitty:kitty,foot:kitty,ghostty:kitty,wezterm:kitty,xterm:mok2", (char_u *)0L} SCTX_INIT}, {"keywordprg", "kp", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, (char_u *)&p_kp, PV_KP, NULL, NULL, diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim index 34efbb527a..24bdc42fe1 100644 --- a/src/testdir/test_options.vim +++ b/src/testdir/test_options.vim @@ -596,6 +596,8 @@ func Test_set_completion_string_values() call assert_equal([&keyprotocol], getcompletion('set keyprotocol=', 'cmdline')) call feedkeys(":set keyprotocol+=someterm:m\\\"\", 'xt') call assert_equal('"set keyprotocol+=someterm:mok2', @:) + call feedkeys(":set keyprotocol+=someterm:k\\\"\", 'xt') + call assert_equal('"set keyprotocol+=someterm:kitty', @:) set keyprotocol& " previewpopup / completepopup @@ -2860,4 +2862,9 @@ func Test_set_missing_options() set w9600=23 endfunc +func Test_default_keyprotocol() + " default value of keyprotocol + call assert_equal('kitty:kitty,foot:kitty,ghostty:kitty,wezterm:kitty,xterm:mok2', &keyprotocol) +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index e23a757f92..0bbe089190 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 969, /**/ 968, /**/ -- 2.39.5