From 7649e2f3eaac44b113f2eb5780b01ba6927425a5 Mon Sep 17 00:00:00 2001
From: pagedown <pg.dn@outlook.com>
Date: Sat, 29 Jan 2022 13:32:36 +0800
Subject: [PATCH 1/3] Docs: Fix macOS shortcut for debug_config

---
 docs/basic.rst | 2 +-
 docs/conf.rst  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/basic.rst b/docs/basic.rst
index 3167dd352..b430e7b75 100644
--- a/docs/basic.rst
+++ b/docs/basic.rst
@@ -133,7 +133,7 @@ Input unicode character             :sc:`input_unicode_character` (also :kbd:`
 Open URL in web browser             :sc:`open_url`
 Reset the terminal                  :sc:`reset_terminal` (also :kbd:`⌥+⌘+r` on macOS)
 Reload :file:`kitty.conf`           :sc:`reload_config_file` (also :kbd:`⌃+⌘+,` on macOS)
-Debug :file:`kitty.conf`            :sc:`debug_config` (also :kbd:`⌘+⌥+f6` on macOS)
+Debug :file:`kitty.conf`            :sc:`debug_config` (also :kbd:`⌥+⌘+,` on macOS)
 Pass current selection to program   :sc:`pass_selection_to_program`
 Edit |kitty| config file            :sc:`edit_config_file` (also :kbd:`⌘+,` on macOS)
 Open a |kitty| shell                :sc:`kitty_shell`
diff --git a/docs/conf.rst b/docs/conf.rst
index 0b10c5e62..4d90920fd 100644
--- a/docs/conf.rst
+++ b/docs/conf.rst
@@ -10,8 +10,8 @@ possibilities.
 You can open the config file within kitty by pressing :sc:`edit_config_file` (:kbd:`⌘+,` on macOS).
 You can reload the config file within kitty by pressing
 :sc:`reload_config_file` (:kbd:`⌃+⌘+,` on macOS) or sending kitty the ``SIGUSR1`` signal.
-You can also display the current configuration by pressing the :sc:`debug_config`
-(:kbd:`⌘+⌥+,` on macOS) key.
+You can also display the current configuration by pressing :sc:`debug_config`
+(:kbd:`⌥+⌘+,` on macOS).
 
 .. _confloc:
 

From 953cf263693113366fbf55f33abafc7263675f22 Mon Sep 17 00:00:00 2001
From: pagedown <pg.dn@outlook.com>
Date: Sat, 29 Jan 2022 13:37:21 +0800
Subject: [PATCH 2/3] macOS: Fix info plist structure version

Set the InfoDictionary version explicitly, hopefully the behavior will
be unchanged when the default version is upgraded.
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index f931b94bf..0a83e2ed0 100755
--- a/setup.py
+++ b/setup.py
@@ -1035,7 +1035,7 @@ def macos_info_plist() -> bytes:
         # Bundle Version Info
         CFBundleVersion=VERSION,
         CFBundleShortVersionString=VERSION,
-        CFBundleInfoDictionaryVersion=VERSION,
+        CFBundleInfoDictionaryVersion='6.0',
         NSHumanReadableCopyright=time.strftime('Copyright %Y, Kovid Goyal'),
         CFBundleGetInfoString='kitty - The fast, feature-rich, GPU based terminal emulator. https://sw.kovidgoyal.net/kitty/',
         # Operating System Version

From 81e7e6a3567467edfb0478f04cafc47fb322c262 Mon Sep 17 00:00:00 2001
From: pagedown <pg.dn@outlook.com>
Date: Sat, 29 Jan 2022 13:41:59 +0800
Subject: [PATCH 3/3] macOS: Disable sudden termination

Since we have the quit confirmation feature, so we explicitly specify
that sudden termination is not supported.
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 0a83e2ed0..e5678aec6 100755
--- a/setup.py
+++ b/setup.py
@@ -1048,8 +1048,8 @@ def macos_info_plist() -> bytes:
         # App Execution
         CFBundleExecutable=appname,
         LSEnvironment={'KITTY_LAUNCHED_BY_LAUNCH_SERVICES': '1'},
-        # Launch Conditions
         LSRequiresNativeExecution=True,
+        NSSupportsSuddenTermination=False,
         # Localization
         # see https://github.com/kovidgoyal/kitty/issues/1233
         CFBundleDevelopmentRegion='English',