Merge from origin/emacs-26

b98cf9c ; Fix a typo in the Emacs manual
700fcd7 * doc/emacs/help.texi: Fix paren typo.
c9c0e40 More minor changes in shell-related nodes of Emacs manual
e6bf19c Fix inaccuracies in "Shell Ring" node of Emacs manual
087681b8 Improve documentation of kmacro commands and variables.
be2e8cb * doc/man/emacs.1.in: Document --fg-daemon and --bg-daemon.
1d9e66a Don't check non-X frames for z order (Bug#31373)
7dc028e Check NSWindow is actually a frame

Conflicts:
	src/nsfns.m

2 files changed, 13 insertions, 9 deletions

diff --git a/src/nsfns.m b/src/nsfns.m
index 7cf45a54f90..9ff7e88a8d4 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -1451,9 +1451,9 @@ 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]))
+      /* Check against [win parentWindow] so that it doesn't match itself. */
+      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);
diff --git a/src/xfns.c b/src/xfns.c
index 78151c81380..fe8170cf635 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5321,12 +5321,16 @@ x_frame_list_z_order (Display* dpy, Window window)
           Lisp_Object frame, tail;
 
           FOR_EACH_FRAME (tail, frame)
-            /* With a reparenting window manager the parent_desc field
-               usually specifies the topmost windows of our frames.
-               Otherwise FRAME_OUTER_WINDOW should do.  */
-            if (XFRAME (frame)->output_data.x->parent_desc == children[i]
-                || FRAME_OUTER_WINDOW (XFRAME (frame)) == children[i])
-              frames = Fcons (frame, frames);
+            {
+              struct frame *cf = XFRAME (frame);
+              /* With a reparenting window manager the parent_desc
+                 field usually specifies the topmost windows of our
+                 frames.  Otherwise FRAME_OUTER_WINDOW should do.  */
+              if (FRAME_X_P (cf)
+                  && (cf->output_data.x->parent_desc == children[i]
+                      || FRAME_OUTER_WINDOW (cf) == children[i]))
+                frames = Fcons (frame, frames);
+            }
         }
 
       if (children) XFree ((char *)children);