diff options
Diffstat (limited to 'src/chartab.c')
| -rw-r--r-- | src/chartab.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/chartab.c b/src/chartab.c index e900a3ae71f..efe23eca83f 100644 --- a/src/chartab.c +++ b/src/chartab.c | |||
| @@ -485,7 +485,6 @@ Lisp_Object | |||
| 485 | char_table_set_range (Lisp_Object table, int from, int to, Lisp_Object val) | 485 | char_table_set_range (Lisp_Object table, int from, int to, Lisp_Object val) |
| 486 | { | 486 | { |
| 487 | struct Lisp_Char_Table *tbl = XCHAR_TABLE (table); | 487 | struct Lisp_Char_Table *tbl = XCHAR_TABLE (table); |
| 488 | Lisp_Object *contents = tbl->contents; | ||
| 489 | 488 | ||
| 490 | if (from == to) | 489 | if (from == to) |
| 491 | char_table_set (table, from, val); | 490 | char_table_set (table, from, val); |
| @@ -759,8 +758,6 @@ map_sub_char_table (void (*c_function) (Lisp_Object, Lisp_Object, Lisp_Object), | |||
| 759 | Lisp_Object function, Lisp_Object table, Lisp_Object arg, Lisp_Object val, | 758 | Lisp_Object function, Lisp_Object table, Lisp_Object arg, Lisp_Object val, |
| 760 | Lisp_Object range, Lisp_Object top) | 759 | Lisp_Object range, Lisp_Object top) |
| 761 | { | 760 | { |
| 762 | /* Pointer to the elements of TABLE. */ | ||
| 763 | Lisp_Object *contents; | ||
| 764 | /* Depth of TABLE. */ | 761 | /* Depth of TABLE. */ |
| 765 | int depth; | 762 | int depth; |
| 766 | /* Minimum and maxinum characters covered by TABLE. */ | 763 | /* Minimum and maxinum characters covered by TABLE. */ |
| @@ -777,14 +774,12 @@ map_sub_char_table (void (*c_function) (Lisp_Object, Lisp_Object, Lisp_Object), | |||
| 777 | struct Lisp_Sub_Char_Table *tbl = XSUB_CHAR_TABLE (table); | 774 | struct Lisp_Sub_Char_Table *tbl = XSUB_CHAR_TABLE (table); |
| 778 | 775 | ||
| 779 | depth = XINT (tbl->depth); | 776 | depth = XINT (tbl->depth); |
| 780 | contents = tbl->contents; | ||
| 781 | min_char = XINT (tbl->min_char); | 777 | min_char = XINT (tbl->min_char); |
| 782 | max_char = min_char + chartab_chars[depth - 1] - 1; | 778 | max_char = min_char + chartab_chars[depth - 1] - 1; |
| 783 | } | 779 | } |
| 784 | else | 780 | else |
| 785 | { | 781 | { |
| 786 | depth = 0; | 782 | depth = 0; |
| 787 | contents = XCHAR_TABLE (table)->contents; | ||
| 788 | min_char = 0; | 783 | min_char = 0; |
| 789 | max_char = MAX_CHAR; | 784 | max_char = MAX_CHAR; |
| 790 | } | 785 | } |
| @@ -1143,7 +1138,6 @@ uniprop_table_uncompress (Lisp_Object table, int idx) | |||
| 1143 | Lisp_Object sub = make_sub_char_table (3, min_char, Qnil); | 1138 | Lisp_Object sub = make_sub_char_table (3, min_char, Qnil); |
| 1144 | struct Lisp_Sub_Char_Table *subtbl = XSUB_CHAR_TABLE (sub); | 1139 | struct Lisp_Sub_Char_Table *subtbl = XSUB_CHAR_TABLE (sub); |
| 1145 | const unsigned char *p, *pend; | 1140 | const unsigned char *p, *pend; |
| 1146 | int i; | ||
| 1147 | 1141 | ||
| 1148 | XSUB_CHAR_TABLE (table)->contents[idx] = sub; | 1142 | XSUB_CHAR_TABLE (table)->contents[idx] = sub; |
| 1149 | p = SDATA (val), pend = p + SBYTES (val); | 1143 | p = SDATA (val), pend = p + SBYTES (val); |
| @@ -1316,7 +1310,7 @@ uniprop_get_encoder (Lisp_Object table) | |||
| 1316 | function may load a Lisp file and thus may cause | 1310 | function may load a Lisp file and thus may cause |
| 1317 | garbage-collection. */ | 1311 | garbage-collection. */ |
| 1318 | 1312 | ||
| 1319 | Lisp_Object | 1313 | static Lisp_Object |
| 1320 | uniprop_table (Lisp_Object prop) | 1314 | uniprop_table (Lisp_Object prop) |
| 1321 | { | 1315 | { |
| 1322 | Lisp_Object val, table, result; | 1316 | Lisp_Object val, table, result; |