diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2017-10-06 09:50:54 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2017-10-06 09:50:54 -0400 |
| commit | 11f9cb522fed9aa6552f6315340ca7352661a1e8 (patch) | |
| tree | 39facc48471c67b321c045e47d70ef030adbea44 /src/frame.c | |
| parent | 92045f4546b9708dc9f69954799d211c1f56ff1e (diff) | |
| parent | 9655937da4a339300c624addd97674c038a01bc9 (diff) | |
| download | emacs-11f9cb522fed9aa6552f6315340ca7352661a1e8.tar.gz emacs-11f9cb522fed9aa6552f6315340ca7352661a1e8.tar.bz2 emacs-11f9cb522fed9aa6552f6315340ca7352661a1e8.zip | |
Merge emacs-26
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/frame.c b/src/frame.c index 1aff3a007ac..ab801eec9c7 100644 --- a/src/frame.c +++ b/src/frame.c @@ -2542,6 +2542,7 @@ for how to proceed. */) (Lisp_Object frame) { struct frame *f = decode_live_frame (frame); +#ifdef HAVE_WINDOW_SYSTEM Lisp_Object parent = f->parent_frame; if (!NILP (parent)) @@ -2562,6 +2563,7 @@ for how to proceed. */) return Qnil; } } +#endif /* HAVE_WINDOW_SYSTEM */ /* Don't allow minibuf_window to remain on an iconified frame. */ check_minibuf_window (frame, EQ (minibuf_window, selected_window)); |