Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
858e55f4
Commit
858e55f4
authored
May 26, 2014
by
Jan Djärv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* nsfns.m (Fns_do_applescript): Put code in the wrong place. Here is correct.
Fixes: debbugs:17424
parent
6cf4e5d6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
src/ChangeLog
src/ChangeLog
+3
-0
src/nsfns.m
src/nsfns.m
+3
-2
No files found.
src/ChangeLog
View file @
858e55f4
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.
...
...
src/nsfns.m
View file @
858e55f4
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment