2002-06-17 Andrew Choi <akochoi@shaw.ca>

        * mac.c (do_applescript): Call initialize_applescript if necessary
        when first called.  Dispose of result_desc only when there is no
        error.
        (Fdo_applescript): Use %d format specifier instead of %ld.

2 files changed, 12 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 080c2d26502..8ce5a257d91 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-17  Andrew Choi  <akochoi@shaw.ca>
+
+        * mac.c (do_applescript): Call initialize_applescript if necessary
+        when first called.  Dispose of result_desc only when there is no
+        error.
+        (Fdo_applescript): Use %d format specifier instead of %ld.
+        
 2002-06-16  Andrew Choi  <akochoi@shaw.ca>
 
         * macterm.c (XTread_socket): Call FrontNonFloatingWindow instead
diff --git a/src/mac.c b/src/mac.c
index c7a9cd35f28..4a97b0d7dd9 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -2446,6 +2446,9 @@ do_applescript (char *script, char **result)
 
   *result = 0;
 
+  if (!as_scripting_component)
+    initialize_applescript();
+
   error = AECreateDesc (typeChar, script, strlen(script), &script_desc);
   if (error)
     return error;
@@ -2502,10 +2505,10 @@ do_applescript (char *script, char **result)
         }
       HUnlock (result_desc.dataHandle);
 #endif /* not TARGET_API_MAC_CARBON */
+      AEDisposeDesc (&result_desc);
     }
 
   AEDisposeDesc (&script_desc);
-  AEDisposeDesc (&result_desc);    
 
   return osaerror;
 }
@@ -2530,7 +2533,7 @@ component.  */)
   if (status)
     {
       if (!result)
-        error ("AppleScript error %ld", status);
+        error ("AppleScript error %d", status);
       else
         {
           /* Unfortunately only OSADoScript in do_applescript knows how