[Emacs-diffs] emacs/src nsterm.h nsfns.m ChangeLog

[Adrian Robert]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Adrian Robert <arobert> 09/01/22 00:00:29

Modified files:
        src            : nsterm.h nsfns.m ChangeLog 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsterm.h?cvsroot=emacs&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsfns.m?cvsroot=emacs&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7295&r2=1.7296

Patches:
Index: nsterm.h
===================================================================
RCS file: /sources/emacs/emacs/src/nsterm.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- nsterm.h    21 Jan 2009 18:13:26 -0000      1.18
+++ nsterm.h    22 Jan 2009 00:00:13 -0000      1.19
@@ -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

Index: nsfns.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsfns.m,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- nsfns.m     8 Jan 2009 03:15:51 -0000       1.32
+++ nsfns.m     22 Jan 2009 00:00:14 -0000      1.33
@@ -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]))
            {

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7295
retrieving revision 1.7296
diff -u -b -r1.7295 -r1.7296
--- ChangeLog   21 Jan 2009 22:28:45 -0000      1.7295
+++ ChangeLog   22 Jan 2009 00:00:17 -0000      1.7296
@@ -1,3 +1,10 @@
+2009-01-21  Adrian Robert  <address@hidden>
+
+       * nsterm.h (EmacsApp-setAppleMenu:): Conditionalize more correctly on
+       Tiger.
+       * nsfns.m (ns_do_applescript): Conditionalize
+       typeUTF16ExternalRepresentation on Tiger.
+
 2009-01-21  Wolfgang Lux  <address@hidden>  (tiny change)
 
        * nsterm.m (EV_TRAILER): Always use emacsframe for frame_or_window.