aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKim F. Storm2004-06-07 10:02:47 +0000
committerKim F. Storm2004-06-07 10:02:47 +0000
commit08384afd01eb1c8e77f00255e4c3bdbf3b1ce92d (patch)
tree94d5bd56f4fb281ad603c6fe9471f4a623e98ad7 /src
parentac03c474d9bf561e06c78ace5ad1d021f8b5da66 (diff)
downloademacs-08384afd01eb1c8e77f00255e4c3bdbf3b1ce92d.tar.gz
emacs-08384afd01eb1c8e77f00255e4c3bdbf3b1ce92d.zip
Typo.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
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 @@
12004-06-07 Miles Bader <miles@gnu.org> 12004-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):