diff options
| author | Alan Third | 2018-05-06 21:49:31 +0100 |
|---|---|---|
| committer | Alan Third | 2018-05-07 22:58:42 +0100 |
| commit | 7dc028e2501feec7d7fca5987ab852b261aa4039 (patch) | |
| tree | ff62967a53cae2c34057bf50c45ae8278728b73e | |
| parent | 1d732d699d63b5dbfa7d0a0f44e6119d58f852bc (diff) | |
| download | emacs-7dc028e2501feec7d7fca5987ab852b261aa4039.tar.gz emacs-7dc028e2501feec7d7fca5987ab852b261aa4039.zip | |
Check NSWindow is actually a frame
* src/nsfns.m (Fns_frame_list_z_order): Check NSWindow is an instance
of EmacsView before treating it as one.
| -rw-r--r-- | src/nsfns.m | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nsfns.m b/src/nsfns.m index 7f2f060dda8..bd1e2283a0c 100644 --- a/src/nsfns.m +++ b/src/nsfns.m | |||
| @@ -1497,7 +1497,8 @@ Frames are listed from topmost (first) to bottommost (last). */) | |||
| 1497 | Lisp_Object frame; | 1497 | Lisp_Object frame; |
| 1498 | 1498 | ||
| 1499 | /* Check against [win parentWindow] so that it doesn't match itself. */ | 1499 | /* Check against [win parentWindow] so that it doesn't match itself. */ |
| 1500 | if (parent == nil || ns_window_is_ancestor (parent, [win parentWindow])) | 1500 | if ([[win delegate] isKindOfClass:[EmacsView class]] |
| 1501 | && (parent == nil || ns_window_is_ancestor (parent, [win parentWindow]))) | ||
| 1501 | { | 1502 | { |
| 1502 | XSETFRAME (frame, ((EmacsView *)[win delegate])->emacsframe); | 1503 | XSETFRAME (frame, ((EmacsView *)[win delegate])->emacsframe); |
| 1503 | frames = Fcons(frame, frames); | 1504 | frames = Fcons(frame, frames); |