Mercurial > emacs
changeset 101330:eca9795f3903
* nsterm.h (EmacsApp-setAppleMenu:): Conditionalize more correctly on Tiger. * nsfns.m (ns_do_applescript): Conditionalize typeUTF16ExternalRepresentation on Tiger.
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Thu, 22 Jan 2009 00:00:13 +0000 |
| parents | 954e1944ccf2 |
| children | 562944d6149f |
| files | src/ChangeLog src/nsfns.m src/nsterm.h |
| diffstat | 3 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Jan 21 22:28:45 2009 +0000 +++ b/src/ChangeLog Thu Jan 22 00:00:13 2009 +0000 @@ -1,3 +1,10 @@ +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.
--- a/src/nsfns.m Wed Jan 21 22:28:45 2009 +0000 +++ b/src/nsfns.m Thu Jan 22 00:00:13 2009 +0000 @@ -2081,8 +2081,10 @@ *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])) {
--- a/src/nsterm.h Wed Jan 21 22:28:45 2009 +0000 +++ b/src/nsterm.h Thu Jan 22 00:00:13 2009 +0000 @@ -363,7 +363,7 @@ 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