procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allocate glyph matrices for the initial frame

Browse source 
* 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
This commit is contained in:
Chris Feng 2016-02-24 08:58:02 +01:00 • committed by Martin Rudalics
parent e01c72f8f4
commit cab3f0a222
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/dispnew.c
View file

@ -683,7 +683,7 @@ void
clear_glyph_matrix_rows (struct glyph_matrix *matrix, int start, int end) clear_glyph_matrix_rows (struct glyph_matrix *matrix, int start, int end)
{ {
eassert (start <= end); eassert (start <= end);
eassert (start >= 0 && start < matrix->nrows); eassert (start >= 0 && start <= matrix->nrows);
eassert (end >= 0 && end <= matrix->nrows); eassert (end >= 0 && end <= matrix->nrows);
for (; start < end; ++start) for (; start < end; ++start)

3
src/frame.c
View file

@ -867,6 +867,9 @@ make_initial_frame (void)
/* The default value of menu-bar-mode is t. */ /* The default value of menu-bar-mode is t. */
set_menu_bar_lines (f, make_number (1), Qnil); set_menu_bar_lines (f, make_number (1), Qnil);
/* Allocate glyph matrices. */
adjust_frame_glyphs (f);
if (!noninteractive) if (!noninteractive)
init_frame_faces (f); init_frame_faces (f);