[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 d09ac15: Fix the --without-x build
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-26 d09ac15: Fix the --without-x build |
Date: |
Mon, 2 Oct 2017 14:36:53 -0400 (EDT) |
branch: emacs-26
commit d09ac15005f36b2788406da6c573487fc323129d
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Fix the --without-x build
* src/frame.c (Ficonify_frame) [HAVE_WINDOW_SYSTEM]: Use
frame_parent only in GUI builds to avoid compilation errors in
--without-x builds. (Bug#28611)
---
src/frame.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/frame.c b/src/frame.c
index 1aff3a0..ab801ee 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));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 d09ac15: Fix the --without-x build,
Eli Zaretskii <=