aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2013-11-07 23:28:21 -0800
committerPaul Eggert2013-11-07 23:28:21 -0800
commit7f1913b2da83e8350717f17beb2cebd73e1e2561 (patch)
treefe6302fa75e9768e31c777d2563264d16be54d17 /src
parent7dd8b873bb2e583b81cbae057395de6e01c46618 (diff)
downloademacs-7f1913b2da83e8350717f17beb2cebd73e1e2561.tar.gz
emacs-7f1913b2da83e8350717f17beb2cebd73e1e2561.zip
* 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
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/chartab.c3
2 files changed, 9 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2914c23ef0e..9bf71b9ce21 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
12013-11-08 Paul Eggert <eggert@cs.ucla.edu>
2
3 * chartab.c (make_sub_char_table): Fix size typo (Bug#15825).
4 This bug was introduced in my 2013-06-21 change, and caused
5 struct Lisp_Sub_Char_Table objects to be given too many slots,
6 which broke 'make -C admin/unidata'.
7
12013-11-07 Jan Djärv <jan.h.d@swipnet.se> 82013-11-07 Jan Djärv <jan.h.d@swipnet.se>
2 9
3 Import changes from mac-port 4.5. 10 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
141make_sub_char_table (int depth, int min_char, Lisp_Object defalt) 141make_sub_char_table (int depth, int min_char, Lisp_Object defalt)
142{ 142{
143 Lisp_Object table; 143 Lisp_Object table;
144 int size = CHAR_TABLE_STANDARD_SLOTS + chartab_size[depth]; 144 int size = (PSEUDOVECSIZE (struct Lisp_Sub_Char_Table, contents)
145 + chartab_size[depth]);
145 146
146 table = Fmake_vector (make_number (size), defalt); 147 table = Fmake_vector (make_number (size), defalt);
147 XSETPVECTYPE (XVECTOR (table), PVEC_SUB_CHAR_TABLE); 148 XSETPVECTYPE (XVECTOR (table), PVEC_SUB_CHAR_TABLE);