Merge from origin/emacs-25

e6a3819 Update HISTORY section in readme for the NextStep interface.
f67f1ed ; * doc/lispref/modes.texi (Font Lock Basics): Minor rewording.
7c81a0b Improve documentation of 'save-place-mode'
cab3f0a Allocate glyph matrices for the initial frame
e01c72f Fix white space in last checkin
370eb67 Make `insert-pair' always leave the cursor where documented
b594393 etc/NEWS: Mention the new second parameter to `package-install'

2 files changed, 4 insertions, 1 deletions

diff --git a/src/dispnew.c b/src/dispnew.c
index fe07f793cb5..b05356a3b64 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -681,7 +681,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 df473aebc21..fd9f3ce0203 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -865,6 +865,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);