diff options
| author | Joakim Verona | 2015-01-25 21:19:27 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-25 21:19:27 +0100 |
| commit | d522fd8ca73e668bfafd0419bc5f71f2751cca24 (patch) | |
| tree | 4b57a4d2d26e578035801f1c895dcfda5895e09d /src/chartab.c | |
| parent | e5087278b9bcab5847ce63d80c0d74c27f50e719 (diff) | |
| parent | a3689d3c661fe36df971c875760f8d500b5ae994 (diff) | |
| download | emacs-d522fd8ca73e668bfafd0419bc5f71f2751cca24.tar.gz emacs-d522fd8ca73e668bfafd0419bc5f71f2751cca24.zip | |
Merge branch 'master' into xwidget
Diffstat (limited to 'src/chartab.c')
| -rw-r--r-- | src/chartab.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/chartab.c b/src/chartab.c index 013a5be575e..acaabce54a7 100644 --- a/src/chartab.c +++ b/src/chartab.c | |||
| @@ -1255,8 +1255,10 @@ uniprop_encode_value_numeric (Lisp_Object table, Lisp_Object value) | |||
| 1255 | break; | 1255 | break; |
| 1256 | value = make_number (i); | 1256 | value = make_number (i); |
| 1257 | if (i == size) | 1257 | if (i == size) |
| 1258 | set_char_table_extras (table, 4, Fvconcat (2, ((Lisp_Object []) { | 1258 | set_char_table_extras (table, 4, |
| 1259 | XCHAR_TABLE (table)->extras[4], Fmake_vector (make_number (1), value) }))); | 1259 | CALLN (Fvconcat, |
| 1260 | XCHAR_TABLE (table)->extras[4], | ||
| 1261 | Fmake_vector (make_number (1), value))); | ||
| 1260 | return make_number (i); | 1262 | return make_number (i); |
| 1261 | } | 1263 | } |
| 1262 | 1264 | ||