From 429332553960cf22a4065f3dd965c3252afe8b91 Mon Sep 17 00:00:00 2001
From: pagedown <pg.dn@outlook.com>
Date: Mon, 10 Jan 2022 10:24:10 +0800
Subject: [PATCH] Cleanup previous PR

Revert the changes related to set_options debug_keyboard.
Remove the Carbon framework flag for glfw.
---
 glfw/glfw.py  | 2 +-
 kitty/state.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/glfw/glfw.py b/glfw/glfw.py
index 9a11d9227..fc06b6b9a 100755
--- a/glfw/glfw.py
+++ b/glfw/glfw.py
@@ -111,7 +111,7 @@ def init_env(
 
     elif module == 'cocoa':
         ans.cppflags.append('-DGL_SILENCE_DEPRECATION')
-        for f_ in 'Cocoa Carbon IOKit CoreFoundation CoreVideo'.split():
+        for f_ in 'Cocoa IOKit CoreFoundation CoreVideo'.split():
             ans.ldpaths.extend(('-framework', f_))
 
     elif module == 'wayland':
diff --git a/kitty/state.c b/kitty/state.c
index 1d9498ff2..1de2752eb 100644
--- a/kitty/state.c
+++ b/kitty/state.c
@@ -685,7 +685,7 @@ PYWRAP0(get_options) {
 PYWRAP1(set_options) {
     PyObject *opts;
     int is_wayland = 0, debug_rendering = 0, debug_font_fallback = 0;
-    PA("O|pppp", &opts, &is_wayland, &debug_rendering, &debug_font_fallback);
+    PA("O|ppp", &opts, &is_wayland, &debug_rendering, &debug_font_fallback);
     if (opts == Py_None) {
         Py_CLEAR(options_object);
         Py_RETURN_NONE;