From f85318cdcdc2f7cf7729117fcc841407776c7e4b Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 14 May 2015 18:48:38 +0300
Subject: [PATCH] Fix daemon crashes when linum-mode is turned on early on

* src/window.c (Fwindow_end): Don't try calling display engine
functions on initial-frame frame.  (Bug#20565)
---
 src/window.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/window.c b/src/window.c
index 0fcf82d43f4..b8281661b4d 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1748,7 +1748,11 @@ if it isn't already recorded.  */)
 	  || b->clip_changed
 	  || b->prevent_redisplay_optimizations_p
 	  || window_outdated (w))
-      && !noninteractive)
+      /* Don't call display routines if we didn't yet create any real
+	 frames, because the glyph matrices are not yet allocated in
+	 that case.  This could happen in some code that runs in the
+	 daemon during initialization (e.g., see bug#20565).  */
+      && !(noninteractive || FRAME_INITIAL_P (WINDOW_XFRAME (w))))
     {
       struct text_pos startp;
       struct it it;
-- 
2.11.4.GIT