mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-30 11:09:23 +00:00
Code Issues Releases Activity

* nsterm.h (EmacsApp-setAppleMenu:): Conditionalize more correctly on Tiger. * nsfns.m (ns_do_applescript): Conditionalize typeUTF16ExternalRepresentation on Tiger.

Browse Source
This commit is contained in:
Adrian Robert 2009-01-22 00:00:13 +00:00
parent d3810c2118
commit a39e2539a3
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ChangeLog
View File

@ -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.

2
src/nsfns.m
View File

@ -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]))
{

2
src/nsterm.h
View File

@ -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