From 7f1913b2da83e8350717f17beb2cebd73e1e2561 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 7 Nov 2013 23:28:21 -0800 Subject: [PATCH] * chartab.c (make_sub_char_table): Fix size typo. This bug was introduced in my 2013-06-21 change, and caused struct Lisp_Sub_Char_Table objects to be given too many slots, which broke 'make -C admin/unidata'. Fixes: debbugs:15825 --- src/ChangeLog | 7 +++++++ src/chartab.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 2914c23ef0e..9bf71b9ce21 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2013-11-08 Paul Eggert + + * chartab.c (make_sub_char_table): Fix size typo (Bug#15825). + This bug was introduced in my 2013-06-21 change, and caused + struct Lisp_Sub_Char_Table objects to be given too many slots, + which broke 'make -C admin/unidata'. + 2013-11-07 Jan Djärv Import changes from mac-port 4.5. diff --git a/src/chartab.c b/src/chartab.c index b7b9590a538..16dd85c12c0 100644 --- a/src/chartab.c +++ b/src/chartab.c @@ -141,7 +141,8 @@ static Lisp_Object make_sub_char_table (int depth, int min_char, Lisp_Object defalt) { Lisp_Object table; - int size = CHAR_TABLE_STANDARD_SLOTS + chartab_size[depth]; + int size = (PSEUDOVECSIZE (struct Lisp_Sub_Char_Table, contents) + + chartab_size[depth]); table = Fmake_vector (make_number (size), defalt); XSETPVECTYPE (XVECTOR (table), PVEC_SUB_CHAR_TABLE); -- 2.11.4.GIT