diff options
| author | Kenichi Handa | 2005-04-22 07:11:21 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2005-04-22 07:11:21 +0000 |
| commit | b9c1591618b888c702de58096036e0790dd375b0 (patch) | |
| tree | a13a1efc8eb9a13963c5cb2f825cd1a22338b2e4 /src | |
| parent | 1468c19bdd7c70f503e8af37eee4c06deec4fe2d (diff) | |
| download | emacs-b9c1591618b888c702de58096036e0790dd375b0.tar.gz emacs-b9c1591618b888c702de58096036e0790dd375b0.zip | |
*** empty log message ***
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/fontset.c | 6 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1d09bde8487..fbf38e28ba1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2005-04-22 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * fns.c (copy_sub_char_table): Explicitly copy the default value | ||
| 4 | of the sub-chartable. | ||
| 5 | |||
| 6 | * fontset.c (fontset_set): When a sub-chartable is created, | ||
| 7 | explicitly sets the defalt value. | ||
| 8 | |||
| 1 | 2005-04-22 Kim F. Storm <storm@cua.dk> | 9 | 2005-04-22 Kim F. Storm <storm@cua.dk> |
| 2 | 10 | ||
| 3 | * fns.c (Fplist_get): Replace by Fsafe_plist_get. | 11 | * fns.c (Fplist_get): Replace by Fsafe_plist_get. |
diff --git a/src/fontset.c b/src/fontset.c index c1de33fcf06..8ef708fa51e 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -353,7 +353,11 @@ fontset_set (fontset, c, newelt) | |||
| 353 | for (i = 0; code[i] > 0; i++) | 353 | for (i = 0; code[i] > 0; i++) |
| 354 | { | 354 | { |
| 355 | if (!SUB_CHAR_TABLE_P (*elt)) | 355 | if (!SUB_CHAR_TABLE_P (*elt)) |
| 356 | *elt = make_sub_char_table (*elt); | 356 | { |
| 357 | Lisp_Object val = *elt; | ||
| 358 | *elt = make_sub_char_table (val); | ||
| 359 | XCHAR_TABLE (*elt)->defalt = val; | ||
| 360 | } | ||
| 357 | elt = &XCHAR_TABLE (*elt)->contents[code[i]]; | 361 | elt = &XCHAR_TABLE (*elt)->contents[code[i]]; |
| 358 | } | 362 | } |
| 359 | if (SUB_CHAR_TABLE_P (*elt)) | 363 | if (SUB_CHAR_TABLE_P (*elt)) |