summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib-src/ChangeLog5
-rw-r--r--src/ChangeLog5
2 files changed, 10 insertions, 0 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index a53b29aa11b..cb573b5bb12 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-06 Gerd Moellmann <gerd@gnu.org>
+
+ * ebrowse.c (ymalloc): Renamed from xmalloc.
+ (yrealloc): Renamed from xrealloc.
+
2000-05-21 Dave Love <fx@gnu.org>
* movemail.c: Include config.h, not ../src/config.h.
diff --git a/src/ChangeLog b/src/ChangeLog
index 0bd177aa4e3..ba45719d3fa 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-06 Gerd Moellmann <gerd@gnu.org>
+
+ * xterm.c (x_produce_glyphs): Don't xassert `it->descent > 0';
+ this isn't true for images with `:ascent 100'.
+
2000-06-06 Kenichi Handa <handa@etl.go.jp>
* buffer.c (Fset_buffer_multibyte): Don't make the current buffer