diff options
| author | Glenn Morris | 2018-12-02 10:32:24 -0800 |
|---|---|---|
| committer | Glenn Morris | 2018-12-02 10:32:24 -0800 |
| commit | b6935dbe1816379dd6a9ffc14b2eaa4435003187 (patch) | |
| tree | 1417fc291003192db440de9e69cc1269edd80c33 /src | |
| parent | e8586d46f774283b4efe9f34e3a6570d1a19edfa (diff) | |
| parent | 317b3547820bf2468c1c0e9b5bed1bde94aeb544 (diff) | |
| download | emacs-b6935dbe1816379dd6a9ffc14b2eaa4435003187.tar.gz emacs-b6935dbe1816379dd6a9ffc14b2eaa4435003187.zip | |
Merge from origin/emacs-26
317b354 ; Add notes about cross-compiling macOS versions
4b176eb Fix macOS run-time feature check
c03574b * etc/NEWS-*: Fix capitalization of "Emacs"
# Conflicts:
# etc/NEWS
Diffstat (limited to 'src')
| -rw-r--r-- | src/nsterm.m | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nsterm.m b/src/nsterm.m index 6ba867d27c0..6c285f0abb7 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -1949,7 +1949,7 @@ x_set_parent_frame (struct frame *f, Lisp_Object new_value, Lisp_Object old_valu | |||
| 1949 | [[child parentWindow] removeChildWindow:child]; | 1949 | [[child parentWindow] removeChildWindow:child]; |
| 1950 | #if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= 101000 | 1950 | #if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= 101000 |
| 1951 | #if MAC_OS_X_VERSION_MIN_REQUIRED < 101000 | 1951 | #if MAC_OS_X_VERSION_MIN_REQUIRED < 101000 |
| 1952 | if ([child respondsToSelector:@selector(setAccessibilitySubrole:)] | 1952 | if ([child respondsToSelector:@selector(setAccessibilitySubrole:)]) |
| 1953 | #endif | 1953 | #endif |
| 1954 | [child setAccessibilitySubrole:NSAccessibilityStandardWindowSubrole]; | 1954 | [child setAccessibilitySubrole:NSAccessibilityStandardWindowSubrole]; |
| 1955 | #endif | 1955 | #endif |
| @@ -1963,7 +1963,7 @@ x_set_parent_frame (struct frame *f, Lisp_Object new_value, Lisp_Object old_valu | |||
| 1963 | ordered: NSWindowAbove]; | 1963 | ordered: NSWindowAbove]; |
| 1964 | #if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= 101000 | 1964 | #if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= 101000 |
| 1965 | #if MAC_OS_X_VERSION_MIN_REQUIRED < 101000 | 1965 | #if MAC_OS_X_VERSION_MIN_REQUIRED < 101000 |
| 1966 | if ([child respondsToSelector:@selector(setAccessibilitySubrole:)] | 1966 | if ([child respondsToSelector:@selector(setAccessibilitySubrole:)]) |
| 1967 | #endif | 1967 | #endif |
| 1968 | [child setAccessibilitySubrole:NSAccessibilityFloatingWindowSubrole]; | 1968 | [child setAccessibilitySubrole:NSAccessibilityFloatingWindowSubrole]; |
| 1969 | #endif | 1969 | #endif |