diff options
| author | Miles Bader | 2000-08-28 14:42:49 +0000 |
|---|---|---|
| committer | Miles Bader | 2000-08-28 14:42:49 +0000 |
| commit | 871882002ae8ec8d2e2c465cf228dc915420fb51 (patch) | |
| tree | 1e30133ff6a3626daa6792cebe13f50432a64f5e /src/ChangeLog | |
| parent | 82a452c8569260a94594452b29ed0b42a4c1f1ae (diff) | |
| download | emacs-871882002ae8ec8d2e2c465cf228dc915420fb51.tar.gz emacs-871882002ae8ec8d2e2c465cf228dc915420fb51.zip | |
(merge_face_vectors):
Clear TO's :font attribute if made inconsistent by a font-related attribute in FROM.
(merge_face_inheritance):
Add function comment.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 69be13105dc..7a82c85e0e8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2000-08-28 Miles Bader <miles@gnu.org> | ||
| 2 | |||
| 3 | * xfaces.c (merge_face_vectors): Clear TO's :font attribute if | ||
| 4 | made inconsistent by a font-related attribute in FROM. | ||
| 5 | (merge_face_inheritance): Add function comment. | ||
| 6 | |||
| 1 | 2000-08-28 Kenichi Handa <handa@etl.go.jp> | 7 | 2000-08-28 Kenichi Handa <handa@etl.go.jp> |
| 2 | 8 | ||
| 3 | * keyboard.c (read_char_minibuf_menu_prompt): Call read_char with | 9 | * keyboard.c (read_char_minibuf_menu_prompt): Call read_char with |