diff options
| author | Kenichi Handa | 2006-08-21 12:51:20 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2006-08-21 12:51:20 +0000 |
| commit | 7c8f6ffdad26eb2371ec60c0eeb975113bbc7b74 (patch) | |
| tree | e02550614be10e79cf46e0610715c3f18f5f9e09 | |
| parent | 4f4426f9b27768c1cadda556dfe466c86f566265 (diff) | |
| download | emacs-7c8f6ffdad26eb2371ec60c0eeb975113bbc7b74.tar.gz emacs-7c8f6ffdad26eb2371ec60c0eeb975113bbc7b74.zip | |
*** empty log message ***
| -rw-r--r-- | lisp/ChangeLog.unicode | 11 | ||||
| -rw-r--r-- | src/ChangeLog.unicode | 17 | ||||
| -rw-r--r-- | src/font.c | 2 |
3 files changed, 29 insertions, 1 deletions
diff --git a/lisp/ChangeLog.unicode b/lisp/ChangeLog.unicode index 2e3dc7ebdb5..93189f469e8 100644 --- a/lisp/ChangeLog.unicode +++ b/lisp/ChangeLog.unicode | |||
| @@ -1,3 +1,14 @@ | |||
| 1 | 2006-08-21 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * international/uni-bidi.el, international/uni-category.el, | ||
| 4 | international/uni-combining.el, international/uni-comment.el, | ||
| 5 | international/uni-decimal.el, international/uni-decomposition.el, | ||
| 6 | international/uni-digit.el, international/uni-lowercase.el, | ||
| 7 | international/uni-mirrored.el, international/uni-name.el, | ||
| 8 | international/uni-numeric.el, international/uni-old-name.el, | ||
| 9 | international/uni-titlecase.el, international/uni-uppercase.el: | ||
| 10 | Re-generated. | ||
| 11 | |||
| 1 | 2006-08-04 Kenichi Handa <handa@m17n.org> | 12 | 2006-08-04 Kenichi Handa <handa@m17n.org> |
| 2 | 13 | ||
| 3 | * international/mule-cmds.el (select-safe-coding-system): Fix | 14 | * international/mule-cmds.el (select-safe-coding-system): Fix |
diff --git a/src/ChangeLog.unicode b/src/ChangeLog.unicode index c7cfafded09..3b7602b587d 100644 --- a/src/ChangeLog.unicode +++ b/src/ChangeLog.unicode | |||
| @@ -1,3 +1,20 @@ | |||
| 1 | 2006-08-21 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * font.c (font_matching_entity): Dolete unused local var. | ||
| 4 | |||
| 5 | * xftfont.c (xftfont_open): Call XftDefaultSubstitute before | ||
| 6 | opening a font. | ||
| 7 | |||
| 8 | * fileio.c (Finsert_file_contents): On recovering a file, assume | ||
| 9 | Unix-like eol. | ||
| 10 | (choose_write_coding_system): On auto-saving a file, force | ||
| 11 | Unix-like eol. | ||
| 12 | |||
| 13 | * coding.c (setup_coding_system): Fix setting of | ||
| 14 | coding->common_flags based on eol_type. | ||
| 15 | (coding_inherit_eol_type): If PARENT is not nil, be sure to | ||
| 16 | inherit from it. | ||
| 17 | |||
| 1 | 2006-08-04 Kenichi Handa <handa@m17n.org> | 18 | 2006-08-04 Kenichi Handa <handa@m17n.org> |
| 2 | 19 | ||
| 3 | * alloc.c (NSTATICS): Increased to 0x600. | 20 | * alloc.c (NSTATICS): Increased to 0x600. |
diff --git a/src/font.c b/src/font.c index b5d814b1dc6..63b762e27ea 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -2393,7 +2393,7 @@ font_matching_entity (frame, spec) | |||
| 2393 | && (NILP (ftype) || EQ (driver_list->driver->type, ftype))) | 2393 | && (NILP (ftype) || EQ (driver_list->driver->type, ftype))) |
| 2394 | { | 2394 | { |
| 2395 | Lisp_Object cache = driver_list->driver->get_cache (frame); | 2395 | Lisp_Object cache = driver_list->driver->get_cache (frame); |
| 2396 | Lisp_Object val, key; | 2396 | Lisp_Object key; |
| 2397 | 2397 | ||
| 2398 | xassert (CONSP (cache)); | 2398 | xassert (CONSP (cache)); |
| 2399 | ASET (spec, FONT_TYPE_INDEX, driver_list->driver->type); | 2399 | ASET (spec, FONT_TYPE_INDEX, driver_list->driver->type); |