diff options
| author | Alan Third | 2020-08-17 20:58:47 +0100 |
|---|---|---|
| committer | Alan Third | 2020-08-18 22:43:21 +0100 |
| commit | 92ec47981acd353658782ce2e094e9f270d8bd8d (patch) | |
| tree | 2c7570e4e866e80239a0865823dc519f37a2e777 | |
| parent | 411a6fd290682f5ae88597194aef164a4a2545d9 (diff) | |
| download | emacs-92ec47981acd353658782ce2e094e9f270d8bd8d.tar.gz emacs-92ec47981acd353658782ce2e094e9f270d8bd8d.zip | |
Get rid of build-time checks around NS tabbar code (bug#33118)
* src/nsterm.m ([EmacsView initFrameFromEmacs:]): Get rid of version
checks.
| -rw-r--r-- | src/nsterm.m | 5 |
1 files changed, 1 insertions, 4 deletions
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) | |||
| 7669 | /* macOS Sierra automatically enables tabbed windows. We can't | 7669 | /* macOS Sierra automatically enables tabbed windows. We can't |
| 7670 | allow this to be enabled until it's available on a Free system. | 7670 | allow this to be enabled until it's available on a Free system. |
| 7671 | Currently it only happens by accident and is buggy anyway. */ | 7671 | Currently it only happens by accident and is buggy anyway. */ |
| 7672 | #if defined (NS_IMPL_COCOA) \ | 7672 | #ifdef NS_IMPL_COCOA |
| 7673 | && MAC_OS_X_VERSION_MAX_ALLOWED >= 101200 | ||
| 7674 | #if MAC_OS_X_VERSION_MIN_REQUIRED < 101200 | ||
| 7675 | if ([win respondsToSelector: @selector(setTabbingMode:)]) | 7673 | if ([win respondsToSelector: @selector(setTabbingMode:)]) |
| 7676 | #endif | ||
| 7677 | [win setTabbingMode: NSWindowTabbingModeDisallowed]; | 7674 | [win setTabbingMode: NSWindowTabbingModeDisallowed]; |
| 7678 | #endif | 7675 | #endif |
| 7679 | 7676 | ||