# HG changeset patch
# User Adrian Robert <Adrian.B.Robert@gmail.com>
# Date 1232582413 0
# Node ID eca9795f390364866bc6da1d351b91d7ecfe10da
# Parent  954e1944ccf29d792ea9cda963b7a0dcae393de1
* nsterm.h (EmacsApp-setAppleMenu:): Conditionalize more correctly on Tiger. * nsfns.m (ns_do_applescript): Conditionalize typeUTF16ExternalRepresentation on Tiger.

diff -r 954e1944ccf2 -r eca9795f3903 src/ChangeLog
--- 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.
diff -r 954e1944ccf2 -r eca9795f3903 src/nsfns.m
--- 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]))
 	    {
diff -r 954e1944ccf2 -r eca9795f3903 src/nsterm.h
--- 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