From d5c378cd6bb8541b7e6d914e1fc7900a257171f9 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sun, 12 Oct 2025 13:18:15 -0700
Subject: [PATCH] minor style tweaks

---
 .../Terminal/Window Styles/TerminalWindow.swift     |  5 +++--
 src/config/Config.zig                               | 13 ++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift b/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift
index 07deb6ded..444ce28bd 100644
--- a/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift	
+++ b/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift	
@@ -573,6 +573,7 @@ class TerminalWindow: NSWindow {
         }
     }
 
+#if compiler(>=6.2)
     // MARK: Glass
 
     @available(macOS 26.0, *)
@@ -616,8 +617,8 @@ class TerminalWindow: NSWindow {
         glassEffectView?.removeFromSuperview()
         glassEffectView = nil
     }
-
->>>>>>> Conflict 4 of 4 ends
+#endif // compiler(>=6.2)
+    
     // MARK: Config
 
     struct DerivedConfig {
diff --git a/src/config/Config.zig b/src/config/Config.zig
index 09731b13d..0e7b51c4f 100644
--- a/src/config/Config.zig
+++ b/src/config/Config.zig
@@ -3106,17 +3106,20 @@ keybind: Keybinds = .{},
 /// Available since: 1.2.0
 @"macos-shortcuts": MacShortcuts = .ask,
 
-/// The background style for macOS windows when `background-opacity` is less than 1.
-/// This controls the visual effect applied behind the terminal background.
+/// The background style for macOS windows when `background-opacity` is less
+/// than 1. This controls the visual effect applied behind the terminal
+/// background.
 ///
 /// Valid values are:
 ///
 ///   * `default` - Uses the standard background behavior. The `background-blur`
-///     configuration will control whether blur is applied (available on all macOS versions)
-///   * `regular-glass` - Standard glass effect with some opacity (macOS 26.0+ only)
+///     configuration will control whether blur is applied (available on
+///     all macOS versions)
+///   * `regular-glass` - Standard glass effect with some opacity (macOS
+///      26.0+ only)
 ///   * `clear-glass` - Highly transparent glass effect (macOS 26.0+ only)
 ///
-/// Available since: 1.2.2
+/// Available since: 1.3.0
 @"macos-background-style": MacBackgroundStyle = .default,
 
 /// Put every surface (tab, split, window) into a dedicated Linux cgroup.