emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs-26 7dc028e: Check NSWindow is actually a frame


From: Alan Third
Subject: [Emacs-diffs] emacs-26 7dc028e: Check NSWindow is actually a frame
Date: Mon, 7 May 2018 18:04:08 -0400 (EDT)

branch: emacs-26
commit 7dc028e2501feec7d7fca5987ab852b261aa4039
Author: Alan Third <address@hidden>
Commit: Alan Third <address@hidden>

    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.
---
 src/nsfns.m | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/nsfns.m b/src/nsfns.m
index 7f2f060..bd1e228 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -1497,7 +1497,8 @@ Frames are listed from topmost (first) to bottommost 
(last).  */)
       Lisp_Object frame;
 
       /* 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);
           frames = Fcons(frame, frames);



reply via email to

[Prev in Thread] Current Thread [Next in Thread]