From 8d75ed53639fbc66046ef8fe7e004a2b1060df5f Mon Sep 17 00:00:00 2001
From: Mike Smith <10135646+mikesmithgh@users.noreply.github.com>
Date: Thu, 31 Oct 2024 09:12:57 -0400
Subject: [PATCH 1/2] chore: add kitty version 0.36.4 to test matrix

---
 .github/workflows/tests.yml                     | 4 +++-
 scripts/internal/__branch-protection-rules.json | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index bcdba6f5..43c84f80 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -36,7 +36,7 @@ jobs:
           - 'stable'  # v0.10.0
           - 'nightly' 
         kitty_version: 
-          - 'stable'  # 0.36.+
+          - 'stable'  # 0.37.+
           - 'nightly'
         # update __branch-protection-rules.json and run __update_branch_protection_rules.sh when modified
         # test all version of nvim released as of v0.9.0
@@ -56,6 +56,8 @@ jobs:
             kitty_version: '0.34.1'
           - nvim_version: 'stable'
             kitty_version: '0.35.2'
+          - nvim_version: 'stable'
+            kitty_version: '0.36.4'
       fail-fast: false
     runs-on: ubuntu-22.04
     steps:
diff --git a/scripts/internal/__branch-protection-rules.json b/scripts/internal/__branch-protection-rules.json
index 1fc6c6e4..7d861b98 100644
--- a/scripts/internal/__branch-protection-rules.json
+++ b/scripts/internal/__branch-protection-rules.json
@@ -13,7 +13,8 @@
       "plenary (stable, 0.32.2)",
       "plenary (stable, 0.33.1)",
       "plenary (stable, 0.34.1)",
-      "plenary (stable, 0.35.2)"
+      "plenary (stable, 0.35.2)",
+      "plenary (stable, 0.36.4)"
     ]
   },
   "enforce_admins": false,

From 686a38b06cdddb066895ea1466717dd03948d9c9 Mon Sep 17 00:00:00 2001
From: Mike Smith <10135646+mikesmithgh@users.noreply.github.com>
Date: Thu, 31 Oct 2024 09:27:03 -0400
Subject: [PATCH 2/2] chore: latest backport changes

---
 lua/kitty-scrollback/backport/backport-sha.json | 5 +++--
 lua/kitty-scrollback/backport/init.lua          | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lua/kitty-scrollback/backport/backport-sha.json b/lua/kitty-scrollback/backport/backport-sha.json
index f50d47a2..470021f2 100644
--- a/lua/kitty-scrollback/backport/backport-sha.json
+++ b/lua/kitty-scrollback/backport/backport-sha.json
@@ -1,4 +1,5 @@
 {
-  "runtime/lua/vim/_system.lua": "691140fdecfa0c3dd28bd68505a47941c26fdf7efb9bfcd72d338e0cb59fe466",
-  "runtime/lua/vim/version.lua": "6d5b925c8af9ad769c6a19e89319a8ad12def13a4184135f490a3b0cb0add4ef"
+  "runtime/lua/vim/_editor.lua": "800e0cca6acc3f53563ceee152e3237cc2be5de915ef40f7f0302daa992d4b17",
+  "runtime/lua/vim/_system.lua": "acf6253586bbe9f08acbb4845260c8d704f8c4e432df3510b92e9fb987eacb6f",
+  "runtime/lua/vim/version.lua": "681dafb4dad3ca135047112b5c744f1c54759eea4676a94c55cbe0ffce0eb930"
 }
diff --git a/lua/kitty-scrollback/backport/init.lua b/lua/kitty-scrollback/backport/init.lua
index d207f222..1ed4dfe2 100644
--- a/lua/kitty-scrollback/backport/init.lua
+++ b/lua/kitty-scrollback/backport/init.lua
@@ -8,7 +8,7 @@ local M = {}
 local function backport_version()
   if type(vim.version().__tostring) ~= 'function' then
     -- NOTE: copied __tostring from
-    -- https://github.com/neovim/neovim/blob/0d3f2c4904d552635da07a6e2b4e75520b514940/runtime/lua/vim/version.lua#L125
+    -- https://github.com/neovim/neovim/blob/1d4ba8c1edba064421b34c1197c3470a09798218/runtime/lua/vim/version.lua#L125
 
     local Version = {}
     function Version:__tostring()
@@ -27,7 +27,7 @@ local function backport_version()
     end
 
     -- NOTE: copied setmetatable from
-    -- https://github.com/neovim/neovim/blob/0d3f2c4904d552635da07a6e2b4e75520b514940/runtime/lua/vim/version.lua#L455
+    -- https://github.com/neovim/neovim/blob/1d4ba8c1edba064421b34c1197c3470a09798218/runtime/lua/vim/version.lua#L463
     setmetatable(vim.version, {
       --- Returns the current Nvim version.
       ---@return vim.Version
@@ -56,7 +56,8 @@ local function backport_uv()
 end
 
 local function backport_system()
-  -- copied from _editor.lua
+  -- NOTE: copied vim.system from
+  -- https://github.com/neovim/neovim/blob/1d4ba8c1edba064421b34c1197c3470a09798218/runtime/lua/vim/_editor.lua#L143
   ---@diagnostic disable-next-line: duplicate-set-field
   vim.system = function(cmd, opts, on_exit)
     if type(opts) == 'function' then