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

Check NSWindow is actually a frame

Browse source 
* src/nsfns.m (Fns_frame_list_z_order): Check NSWindow is an instance
of EmacsView before treating it as one.
This commit is contained in:
Alan Third 2018-05-06 21:49:31 +01:00
parent 1d732d699d
commit 7dc028e250
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/nsfns.m
View file

@ -1497,7 +1497,8 @@ Frames are listed from topmost (first) to bottommost (last). */)
Lisp_Object frame; Lisp_Object frame;
/* Check against [win parentWindow] so that it doesn't match itself. */ /* Check against [win parentWindow] so that it doesn't match itself. */
if (parent == nil || ns_window_is_ancestor (parent, [win parentWindow])) if ([[win delegate] isKindOfClass:[EmacsView class]]
&& (parent == nil || ns_window_is_ancestor (parent, [win parentWindow])))
{ {
XSETFRAME (frame, ((EmacsView *)[win delegate])->emacsframe); XSETFRAME (frame, ((EmacsView *)[win delegate])->emacsframe);
frames = Fcons(frame, frames); frames = Fcons(frame, frames);