mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-11 08:30:45 -08:00
Code Issues Projects Releases Wiki Activity

Make frame-list-z-order on NS match Windows behaviour (bug#28788)

Browse source 
* src/nsfns.m (Fns_frame_list_z_order): If terminal isn't a frame,
ignore it rather than returning nil.
This commit is contained in:
Alan Third 2017-10-11 22:17:10 +01:00
parent 906224eba1
commit 078fb7f6df
1 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/nsfns.m
View file

@ -1476,13 +1476,8 @@ ns_window_is_ancestor (NSWindow *win, NSWindow *candidate)
DEFUN ("ns-frame-list-z-order", Fns_frame_list_z_order, DEFUN ("ns-frame-list-z-order", Fns_frame_list_z_order,
Sns_frame_list_z_order, 0, 1, 0, Sns_frame_list_z_order, 0, 1, 0,
doc: /* Return list of Emacs' frames, in Z (stacking) order. doc: /* Return list of Emacs' frames, in Z (stacking) order.
The optional argument TERMINAL specifies which display to ask about. If TERMINAL is non-nil and specifies a live frame, return the child
TERMINAL should be either a frame or a display name (a string). If frames of that frame in Z (stacking) order.
omitted or nil, that stands for the selected frame's display. Return
nil if TERMINAL contains no Emacs frame.
As a special case, if TERMINAL is non-nil and specifies a live frame,
return the child frames of that frame in Z (stacking) order.
Frames are listed from topmost (first) to bottommost (last). */) Frames are listed from topmost (first) to bottommost (last). */)
(Lisp_Object terminal) (Lisp_Object terminal)
@ -1492,8 +1487,6 @@ Frames are listed from topmost (first) to bottommost (last). */)
if (FRAMEP (terminal) && FRAME_LIVE_P (XFRAME (terminal))) if (FRAMEP (terminal) && FRAME_LIVE_P (XFRAME (terminal)))
parent = [FRAME_NS_VIEW (XFRAME (terminal)) window]; parent = [FRAME_NS_VIEW (XFRAME (terminal)) window];
else if (!NILP (terminal))
return Qnil;
for (NSWindow *win in [[NSApp orderedWindows] reverseObjectEnumerator]) for (NSWindow *win in [[NSApp orderedWindows] reverseObjectEnumerator])
{ {