procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* nsfns.m (Fns_do_applescript): Put code in the wrong place. Here is correct.

Browse source 
Fixes: debbugs:17424
This commit is contained in:
Jan Djärv 2014-05-26 13:26:24 +02:00
parent 6cf4e5d6f6
commit 858e55f412
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ChangeLog
View file

@ -1,5 +1,8 @@
2014-05-26 Jan Djärv <jan.h.d@swipnet.se>
* nsfns.m (Fns_do_applescript): Surround NSApp run
with calls to ns_init_events, ns_finish_events (Bug#17424).
* nsterm.h (ns_init_events, ns_finish_events): Declare.
* nsterm.m (ns_init_events, ns_finish_events): New functions.

5
src/nsfns.m
View file

@ -2094,10 +2094,8 @@ and GNUstep implementations ("distributor-specific release
[[NSAppleScript alloc] initWithSource:
[NSString stringWithUTF8String: SSDATA (script)]];
ns_init_events ();
returnDescriptor = [scriptObject executeAndReturnError: &errorDict];
[scriptObject release];
ns_finish_events ();
*result = Qnil;
if (returnDescriptor != NULL)
@ -2158,6 +2156,7 @@ and GNUstep implementations ("distributor-specific release
Lisp_Object result;
int status;
NSEvent *nxev;
struct input_event ev;
CHECK_STRING (script);
check_window_system (NULL);
@ -2185,8 +2184,10 @@ and GNUstep implementations ("distributor-specific release
// If there are other events, the event loop may exit. Keep running
// until the script has been handled. */
ns_init_events (&ev);
while (! NILP (as_script))
[NSApp run];
ns_finish_events ();
status = as_status;
as_status = 0;