Commit a39e2539 authored by Adrian Robert's avatar Adrian Robert

* nsterm.h (EmacsApp-setAppleMenu:): Conditionalize more correctly on Tiger. *...

* nsterm.h (EmacsApp-setAppleMenu:): Conditionalize more correctly on Tiger. * nsfns.m (ns_do_applescript): Conditionalize typeUTF16ExternalRepresentation on Tiger.
parent d3810c21
2009-01-21 Adrian Robert <Adrian.B.Robert@gmail.com>
* nsterm.h (EmacsApp-setAppleMenu:): Conditionalize more correctly on
Tiger.
* nsfns.m (ns_do_applescript): Conditionalize
typeUTF16ExternalRepresentation on Tiger.
2009-01-21 Wolfgang Lux <wolfgang.lux@gmail.com> (tiny change)
* nsterm.m (EV_TRAILER): Always use emacsframe for frame_or_window.
......
......@@ -2081,8 +2081,10 @@ and GNUstep implementations ("distributor-specific release
*result = Qt;
// script returned an AppleScript result
if ((typeUnicodeText == [returnDescriptor descriptorType]) ||
#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
(typeUTF16ExternalRepresentation
== [returnDescriptor descriptorType]) ||
#endif
(typeUTF8Text == [returnDescriptor descriptorType]) ||
(typeCString == [returnDescriptor descriptorType]))
{
......
......@@ -363,7 +363,7 @@ extern NSArray *ns_send_types, *ns_return_types;
extern EmacsMenu *mainMenu, *svcsMenu, *dockMenu;
/* Apple removed the declaration, but kept the implementation */
#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4
#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
@interface NSApplication (EmacsApp)
- (void)setAppleMenu: (NSMenu *)menu;
@end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment