diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0770eaeff69..583537d889d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | 2004-06-07 Miles Bader <miles@gnu.org> | 1 | 2004-06-07 Miles Bader <miles@gnu.org> |
| 2 | 2 | ||
| 3 | * (struct named_merge_point): New type. | 3 | * xfaces.c (struct named_merge_point): New type. |
| 4 | (push_named_merge_point): New function. | 4 | (push_named_merge_point): New function. |
| 5 | (merge_named_face): New function. | 5 | (merge_named_face): New function. |
| 6 | (merge_face_ref, face_at_buffer_position, face_at_string_position): | 6 | (merge_face_ref, face_at_buffer_position, face_at_string_position): |