From: Alan Third <alan@idiocy.org>
Date: Mon, 17 Aug 2020 19:58:47 +0000 (+0100)
Subject: Get rid of build-time checks around NS tabbar code (bug#33118)
X-Git-Tag: emacs-28.0.90~6524
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=92ec47981acd353658782ce2e094e9f270d8bd8d;p=emacs.git

Get rid of build-time checks around NS tabbar code (bug#33118)

* src/nsterm.m ([EmacsView initFrameFromEmacs:]): Get rid of version
checks.
---

diff --git a/src/nsterm.m b/src/nsterm.m
index c1d133a00e5..98c5b69d681 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -7669,11 +7669,8 @@ not_in_argv (NSString *arg)
   /* macOS Sierra automatically enables tabbed windows.  We can't
      allow this to be enabled until it's available on a Free system.
      Currently it only happens by accident and is buggy anyway.  */
-#if defined (NS_IMPL_COCOA) \
-  && MAC_OS_X_VERSION_MAX_ALLOWED >= 101200
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 101200
+#ifdef NS_IMPL_COCOA
   if ([win respondsToSelector: @selector(setTabbingMode:)])
-#endif
     [win setTabbingMode: NSWindowTabbingModeDisallowed];
 #endif