summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>2000-09-08 14:20:44 +0000
committerGerd Moellmann <gerd@gnu.org>2000-09-08 14:20:44 +0000
commitc454aac1921dfc9e7afa4e139ac7ed95dd27faa1 (patch)
tree4e3b44be07d5000b1b0ad0957255abf8ee76e31e /src
parent334a2e2a82cb041ec1d0c744e408573aa37d8915 (diff)
downloademacs-c454aac1921dfc9e7afa4e139ac7ed95dd27faa1.tar.gz
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 88902089325..03589ba0c81 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
2000-09-08 Gerd Moellmann <gerd@gnu.org>
+ * xfaces.c (Finternal_merge_in_global_face): Return a Lisp object.
+
+ * xdisp.c (dump_glyph_row): Fix printf format string.
+ (display_line, move_it_in_display_line_to): Avoid compiler
+ warnings.
+
* s/freebsd.h (GC_MARK_STACK, REL_ALLOC_MMAP): Define.
* keymap.c (Fset_keymap_parent): Check for cycles in keymap