From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chris Feng Newsgroups: gmane.emacs.bugs Subject: bug#22787: [PATCH] Allocate glyph matrices for the initial frame Date: Wed, 24 Feb 2016 14:32:17 +0800 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1456295595 17463 80.91.229.3 (24 Feb 2016 06:33:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 24 Feb 2016 06:33:15 +0000 (UTC) To: 22787@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Feb 24 07:33:08 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aYT0V-00061b-So for geb-bug-gnu-emacs@m.gmane.org; Wed, 24 Feb 2016 07:33:08 +0100 Original-Received: from localhost ([::1]:33848 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYT0V-0003p4-9S for geb-bug-gnu-emacs@m.gmane.org; Wed, 24 Feb 2016 01:33:07 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51703) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYT0R-0003od-MS for bug-gnu-emacs@gnu.org; Wed, 24 Feb 2016 01:33:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYT0Q-0005ue-KO for bug-gnu-emacs@gnu.org; Wed, 24 Feb 2016 01:33:03 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:45229) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYT0Q-0005ua-Gz for bug-gnu-emacs@gnu.org; Wed, 24 Feb 2016 01:33:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1aYT0Q-0002E4-Ck for bug-gnu-emacs@gnu.org; Wed, 24 Feb 2016 01:33:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Chris Feng Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 24 Feb 2016 06:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 22787 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.14562955518517 (code B ref -1); Wed, 24 Feb 2016 06:33:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 24 Feb 2016 06:32:31 +0000 Original-Received: from localhost ([127.0.0.1]:42356 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aYSzu-0002DJ-Sx for submit@debbugs.gnu.org; Wed, 24 Feb 2016 01:32:31 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:60576) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aYSzt-0002D7-2y for submit@debbugs.gnu.org; Wed, 24 Feb 2016 01:32:29 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYSzj-0005pV-TO for submit@debbugs.gnu.org; Wed, 24 Feb 2016 01:32:20 -0500 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:45091) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYSzj-0005pR-Pz for submit@debbugs.gnu.org; Wed, 24 Feb 2016 01:32:19 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYSzj-0003dF-14 for bug-gnu-emacs@gnu.org; Wed, 24 Feb 2016 01:32:19 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYSzi-0005pH-93 for bug-gnu-emacs@gnu.org; Wed, 24 Feb 2016 01:32:18 -0500 Original-Received: from mail-wm0-x22a.google.com ([2a00:1450:400c:c09::22a]:36788) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYSzi-0005pD-3h for bug-gnu-emacs@gnu.org; Wed, 24 Feb 2016 01:32:18 -0500 Original-Received: by mail-wm0-x22a.google.com with SMTP id g62so255626039wme.1 for ; Tue, 23 Feb 2016 22:32:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=lB88i6+es2MIn90Ww+Qri6Z25dvzR8B42AE23tCz+5o=; b=BInfxjR/ONesoTtFRTjv6aOPHozpo+/7up63Xjk0PBbv7JqCeOkSkxJsrn90LuAWbS lxfeL6JeLDczvQX83kWenABG+1jq2jfwkHwP1XdmM/K24qOtfb1otJG7oDdL2rcuGi2C sdNLXmD1i0pPQksSY8eP/b9CQ8bSdwsUKMVkkDjFWnE1eS7f4/CpNAyH3GZr1fvkqlPA h9a0NsOAWHMnrnubQ7oSkCcpU/PX+AGADV+p/NzyxFJUEeS655HrCy9pzkUKY441QNom UHbOg0bF0hj8Mkwn9DkZVhCU2S9ZS+53jvlJc6g7rX7CNVMhP4VefbppraWsp8Fm7cOw rppQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:date:message-id:subject:from:to :content-type; bh=lB88i6+es2MIn90Ww+Qri6Z25dvzR8B42AE23tCz+5o=; b=GuE/2FSD4UqC+Si9ZKDfFfQZiqQyefUYLBPhLiRr0vvgmlf0nkjZzVAOASwz11w9eH JTk1pEK/VDBS/Xk3gkP34BXmRZX2McDdPHTlrve9l2H9yY2x8dSzrRFm59NEp/pScWdq 8gIdNKeahe8PYrP2uM/O2Ct0jtCPyENWuEDkxdS+DI1rcpagJhFlHhhA3yLSD5FK03cp e4ojYv9y/Rx4+S7TDEZCQzl4USxW6Garb+lUC6PWYXb6B222/TkIyAfZxU6D5u+Nc8h0 lUmE9O0nBI/1d41W54UjDOhU5vkg8KweieDqstUe1j9ihGBL4FqyJ1h9Bz+ozvIbyaz8 z5rQ== X-Gm-Message-State: AG10YORiHNpIs52fzti9ca3pXrAorrNBFXsf6LzLlUgRaePX4U35O1xlK0ub357BBhUb8FrPh5t1HBg9EnmSOg== X-Received: by 10.194.103.72 with SMTP id fu8mr40166088wjb.70.1456295537079; Tue, 23 Feb 2016 22:32:17 -0800 (PST) Original-Received: by 10.194.190.104 with HTTP; Tue, 23 Feb 2016 22:32:17 -0800 (PST) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:113682 Archived-At: After bd4de70f the initial frame is created without the glyph matrices allocated. As a result Emacs in batch/daemon mode would crash when evaluating certain functions (e.g. line-pixel-height, window-text-pixel-size). * src/frame.c (make_initial_frame): Allocate glyph matrices. * src/dispnew.c (clear_glyph_matrix_rows): matrix->nrows can be 0. --- src/dispnew.c | 2 +- src/frame.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/dispnew.c b/src/dispnew.c index 433a6e9..f96db30 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 8c86afe..4f61332 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); -- 2.7.0