diff options
| author | Karoly Lorentey | 2004-06-07 19:20:00 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-06-07 19:20:00 +0000 |
| commit | 57316ec80311d78e159e03b5943be0a9b129af76 (patch) | |
| tree | 7648d6e985c4c85dd513eb248641b653e552cf6f /src | |
| parent | 620c7a273359e1b13adee5896933ce9fa122c860 (diff) | |
| parent | 08384afd01eb1c8e77f00255e4c3bdbf3b1ce92d (diff) | |
| download | emacs-57316ec80311d78e159e03b5943be0a9b129af76.tar.gz emacs-57316ec80311d78e159e03b5943be0a9b129af76.zip | |
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-382
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-191
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): |