From: Paul W. Rankin <pwr@bydasein.com>
Date: Sat, 8 May 2021 09:09:59 +0000 (+1000)
Subject: src/nsterm.m: fix window tabbing on macOS
X-Git-Tag: emacs-28.0.90~2183
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2207f9adccc0411b7ad73a3703f16250d7f8e139;p=emacs.git

src/nsterm.m: fix window tabbing on macOS

* src/nsterm.m: remove NSWindowTabbingModeDisallowed to respect
  system-wide preferences
* etc/NEWS: add mention of native tab support in macOS and where
  to specify system-wide setting
---

diff --git a/etc/NEWS b/etc/NEWS
index 7d53eafbae2..57e52e266a9 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -3216,6 +3216,14 @@ The new variable 'xwidget-webkit-download-dir' says where to download to.
 'module-file-suffix' now has the value ".dylib" on macOS, but the
 ".so" suffix is supported as well.
 
++++
+** On macOS, Emacs now supports native tabs (in macOS 10.12 and later).
+Native tabbing behavior is specified system-wide via System
+Preferences, under under General > 'Prefer tabs when opening
+documents'. In macOS versions 10.15 and earlier, this option is
+located under Dock instead. Note that this feature is unrelated to the
+Emacs 'tab-bar-mode'.
+
 +++
 ** On MS-Windows, Emacs can now toggle the IME.
 A new function 'w32-set-ime-open-status' can now be used to disable
diff --git a/src/nsterm.m b/src/nsterm.m
index f6168243a49..11b02f1726e 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -7628,14 +7628,6 @@ not_in_argv (NSString *arg)
          selector:@selector (viewDidResize:)
              name:NSViewFrameDidChangeNotification object:nil];
 
-  /* 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.  */
-#ifdef NS_IMPL_COCOA
-  if ([win respondsToSelector: @selector(setTabbingMode:)])
-    [win setTabbingMode: NSWindowTabbingModeDisallowed];
-#endif
-
   ns_window_num++;
   return self;
 }