From: Adrian Robert <Adrian.B.Robert@gmail.com>
Date: Thu, 22 Jan 2009 00:00:13 +0000 (+0000)
Subject: * nsterm.h (EmacsApp-setAppleMenu:): Conditionalize more correctly on Tiger. * nsfns... 
X-Git-Tag: emacs-pretest-23.0.90~335
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a39e2539a37730aa4f9597b91022404d70df410e;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 90e83f03667..aed15a171fc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/nsfns.m b/src/nsfns.m
index f981d44d511..6e1c6c05aa2 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -2081,8 +2081,10 @@ ns_do_applescript (script, result)
 	  *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 --git a/src/nsterm.h b/src/nsterm.h
index 7c295edeb2d..351c5160fe4 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -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