Mercurial > emacs

diff src/mac.c @ 45851:7b1f766314f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Andrew Choi <akochoi@shaw.ca>
date Mon, 17 Jun 2002 06:06:03 +0000
parents 39cdf9669519
children 40db0673e6f0
line wrap: on
line diff
--- a/src/mac.c	Mon Jun 17 01:45:48 2002 +0000
+++ b/src/mac.c	Mon Jun 17 06:06:03 2002 +0000
@@ -2446,6 +2446,9 @@
 
   *result = 0;
 
+  if (!as_scripting_component)
+    initialize_applescript();
+
   error = AECreateDesc (typeChar, script, strlen(script), &script_desc);
   if (error)
     return error;
@@ -2502,10 +2505,10 @@
         }
       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 @@
   if (status)
     {
       if (!result)
-        error ("AppleScript error %ld", status);
+        error ("AppleScript error %d", status);
       else
         {
           /* Unfortunately only OSADoScript in do_applescript knows how