From: Chris Feng <chris.w.feng@gmail.com>
Date: Wed, 24 Feb 2016 07:58:02 +0000 (+0100)
Subject: Allocate glyph matrices for the initial frame
X-Git-Tag: emacs-25.0.92~46
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cab3f0a;p=emacs.git

Allocate glyph matrices for the initial frame

* src/frame.c (make_initial_frame): Allocate glyph matrices (Bug#22787).

* src/dispnew.c (clear_glyph_matrix_rows): matrix->nrows can be 0.

Copyright-paperwork-exempt: yes
---

diff --git a/src/dispnew.c b/src/dispnew.c
index 433a6e9ed4a..f96db302781 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -683,7 +683,7 @@ void
 clear_glyph_matrix_rows (struct glyph_matrix *matrix, int start, int end)
 {
   eassert (start <= end);
-  eassert (start >= 0 && start < matrix->nrows);
+  eassert (start >= 0 && start <= matrix->nrows);
   eassert (end >= 0 && end <= matrix->nrows);
 
   for (; start < end; ++start)
diff --git a/src/frame.c b/src/frame.c
index 8c86afe4efb..4f61332ace1 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -867,6 +867,9 @@ make_initial_frame (void)
   /* The default value of menu-bar-mode is t.  */
   set_menu_bar_lines (f, make_number (1), Qnil);
 
+  /* Allocate glyph matrices.  */
+  adjust_frame_glyphs (f);
+
   if (!noninteractive)
     init_frame_faces (f);