From 473e1a6f224434f9a1b21b39f46cf0e4ea00dfe9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 13 Aug 2021 09:31:18 +0530
Subject: [PATCH] Fix #3926

Apparently nvim assumes cnorm doesn't affect cursor shape. It's
ambiguous whether cnorm should affect it or not. So to prevent
regressions in case other programs assume that as well, have it only
make the cursor visible and blinking, without changing its shape.
---
 kitty/terminfo.py       |   2 +-
 terminfo/kitty.terminfo |   2 +-
 terminfo/x/xterm-kitty  | Bin 3297 -> 3297 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kitty/terminfo.py b/kitty/terminfo.py
index 115ccf060..13b75fb14 100644
--- a/kitty/terminfo.py
+++ b/kitty/terminfo.py
@@ -113,7 +113,7 @@ string_capabilities = {
     # Clear screen
     'clear': r'\E[H\E[2J',
     # Make cursor appear normal
-    'cnorm': r'\E[1 q\E[?25h',
+    'cnorm': r'\E[?12h\E[?25h',
     # Carriage return
     'cr': r'^M',  # CR (carriage return \r)
     # Change scroll region
diff --git a/terminfo/kitty.terminfo b/terminfo/kitty.terminfo
index 18580cf15..d1c3a9656 100644
--- a/terminfo/kitty.terminfo
+++ b/terminfo/kitty.terminfo
@@ -24,7 +24,7 @@ xterm-kitty|KovIdTTY,
 	cbt=\E[Z,
 	civis=\E[?25l,
 	clear=\E[H\E[2J,
-	cnorm=\E[1 q\E[?25h,
+	cnorm=\E[?12h\E[?25h,
 	cr=^M,
 	csr=\E[%i%p1%d;%p2%dr,
 	cub=\E[%p1%dD,
diff --git a/terminfo/x/xterm-kitty b/terminfo/x/xterm-kitty
index a4e0cb2d9d5bfdd523a4292fe6d50ad41164fec6..83fbb786be33b0102884f75405e06a596e2918ab 100644
GIT binary patch
delta 541
zcmY*UUucbC9R5A;^E+Z&wv!o0IxJkEEmIVwwU(kRoeLbIiMDKQcCpkF9lPM-L`z>v
zvDB%<g+H?<L?K1(f@p4*q$9O<rO{ej^7DRQUq^oRKJWAI?S0=;s+6i+h2^qZs-+8s
ztCjt^PBH72(=s6E<bvmy{L0Ia$Llie(X1eM<erSmGkGCzyz^crWKzC*HWTGx$LyEq
zbFrTH`=4^=un1MCK`mAyjrG`sE!d8oFl&Y_vsUau8#2gxqa7#Fg<#O7kN05!gUBPm
zO%(9}Pw>hY{>?bP#QHm?@DsC`!vgj>v;8jPF`R?$kY`zUIMPQv-iX*OS9C!Vbrp9b
zX*S~goojOsV;P<ujrh~D^U}R_?;`cd<LB7_R?f|)-48eGemk;)Nv2rOjcno$ws0>q
z%(9)G?ByAr=S5!OH4d}L`+UUbe9duw<m6_SIL#T(6S_oebcLpMgEr_k-KD#=O%LcX
z?a&_W*RvXwT;tN5=5<I5dRs^Iv4%gYt4)ND|9?^m-)^b0HF35saUy8oQEhJ8dTQ)4
LTN7g+7AN&D#+?L+

delta 540
zcmY*UU5JcP7=EAgykD&y8BE5m>^9+o{47OLlE0#CnhOlIZOE1lTddkdhT>w1Ek-Fe
zH8ouLSz8kug%q_HMBHqWOiFvDrEObndY$j<YqovsJm>j4opY*<)yBjE%#($Zlunec
zCA#w+V%8}qq({z5-t)_T6{OeWP3iM!R+4-2KnCQQypT8Ec`u)2SiX5S8s%Zf?2qT;
zv7Yezzgh+aNFa$6=A#LVu?#I(hYc{>1WVag>_98B$a$k3hjA3ei>~=#7kY331zg8%
zl<^2p@yZvbW(Z$n{R2Po8)F#9U+i*byIs~}ID6eb&vI^mqz`z!6|p<6?22=cuD>5i
zvwr9A%;X=(GCVsF@xhw&(!F)>BK6thm)Nh?a<dWl%Z<57=QxA2*}x2!ay8d;Gj}q}
z9NXE!<2=oCyu>TK!9JGxkQF}XYYy=vhnMp^M>xs}iq>gT)7qp<bcL?fjk;Z1b&s~`
z5k01-^o$m(Zq=;wTF_oC>0RyDCmQ}JoeILoPoIXsx3|o+<~Umv94fA48`oq`R<3ee
KQ29_dSN{VZk^`jx