diff options
| author | Eli Zaretskii | 2013-09-26 10:37:16 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-09-26 10:37:16 +0300 |
| commit | b87c4ff2817e71ca71b028792200b1e069a95e04 (patch) | |
| tree | bfe00c0655fa02078a9ab2c633ea06d90c4a2064 /src/chartab.c | |
| parent | bbc108377873aa6ed7cf21c731770103096eea39 (diff) | |
| parent | ba355de014b75ed104da4777f909db70d62f2357 (diff) | |
| download | emacs-b87c4ff2817e71ca71b028792200b1e069a95e04.tar.gz emacs-b87c4ff2817e71ca71b028792200b1e069a95e04.zip | |
Merge from trunk.
Diffstat (limited to 'src/chartab.c')
| -rw-r--r-- | src/chartab.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/chartab.c b/src/chartab.c index b7b9590a538..089c4254da6 100644 --- a/src/chartab.c +++ b/src/chartab.c | |||
| @@ -1258,7 +1258,7 @@ uniprop_encode_value_character (Lisp_Object table, Lisp_Object value) | |||
| 1258 | static Lisp_Object | 1258 | static Lisp_Object |
| 1259 | uniprop_encode_value_run_length (Lisp_Object table, Lisp_Object value) | 1259 | uniprop_encode_value_run_length (Lisp_Object table, Lisp_Object value) |
| 1260 | { | 1260 | { |
| 1261 | Lisp_Object *value_table = XVECTOR (XCHAR_TABLE (table)->extras[4])->contents; | 1261 | Lisp_Object *value_table = XVECTOR (XCHAR_TABLE (table)->extras[4])->u.contents; |
| 1262 | int i, size = ASIZE (XCHAR_TABLE (table)->extras[4]); | 1262 | int i, size = ASIZE (XCHAR_TABLE (table)->extras[4]); |
| 1263 | 1263 | ||
| 1264 | for (i = 0; i < size; i++) | 1264 | for (i = 0; i < size; i++) |
| @@ -1276,7 +1276,7 @@ uniprop_encode_value_run_length (Lisp_Object table, Lisp_Object value) | |||
| 1276 | static Lisp_Object | 1276 | static Lisp_Object |
| 1277 | uniprop_encode_value_numeric (Lisp_Object table, Lisp_Object value) | 1277 | uniprop_encode_value_numeric (Lisp_Object table, Lisp_Object value) |
| 1278 | { | 1278 | { |
| 1279 | Lisp_Object *value_table = XVECTOR (XCHAR_TABLE (table)->extras[4])->contents; | 1279 | Lisp_Object *value_table = XVECTOR (XCHAR_TABLE (table)->extras[4])->u.contents; |
| 1280 | int i, size = ASIZE (XCHAR_TABLE (table)->extras[4]); | 1280 | int i, size = ASIZE (XCHAR_TABLE (table)->extras[4]); |
| 1281 | 1281 | ||
| 1282 | CHECK_NUMBER (value); | 1282 | CHECK_NUMBER (value); |