diff options
| author | Chris Feng | 2016-02-24 08:58:02 +0100 |
|---|---|---|
| committer | Martin Rudalics | 2016-02-24 08:58:02 +0100 |
| commit | cab3f0a222412b1fd592b1c2f1e305fa245f9279 (patch) | |
| tree | e4eaf98a578e5e96d62d332886c2e6ec01ee914a /src | |
| parent | e01c72f8f4987f9de71130b8b6d8224999fc6c6f (diff) | |
| download | emacs-cab3f0a222412b1fd592b1c2f1e305fa245f9279.tar.gz emacs-cab3f0a222412b1fd592b1c2f1e305fa245f9279.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/dispnew.c | 2 | ||||
| -rw-r--r-- | src/frame.c | 3 |
2 files changed, 4 insertions, 1 deletions
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 | |||
| 683 | clear_glyph_matrix_rows (struct glyph_matrix *matrix, int start, int end) | 683 | clear_glyph_matrix_rows (struct glyph_matrix *matrix, int start, int end) |
| 684 | { | 684 | { |
| 685 | eassert (start <= end); | 685 | eassert (start <= end); |
| 686 | eassert (start >= 0 && start < matrix->nrows); | 686 | eassert (start >= 0 && start <= matrix->nrows); |
| 687 | eassert (end >= 0 && end <= matrix->nrows); | 687 | eassert (end >= 0 && end <= matrix->nrows); |
| 688 | 688 | ||
| 689 | for (; start < end; ++start) | 689 | 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) | |||
| 867 | /* The default value of menu-bar-mode is t. */ | 867 | /* The default value of menu-bar-mode is t. */ |
| 868 | set_menu_bar_lines (f, make_number (1), Qnil); | 868 | set_menu_bar_lines (f, make_number (1), Qnil); |
| 869 | 869 | ||
| 870 | /* Allocate glyph matrices. */ | ||
| 871 | adjust_frame_glyphs (f); | ||
| 872 | |||
| 870 | if (!noninteractive) | 873 | if (!noninteractive) |
| 871 | init_frame_faces (f); | 874 | init_frame_faces (f); |
| 872 | 875 | ||