*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 78614367d1d4b656966352f0608a0c87c7038ab0..e722f4c643c7c993afac8908ac2b84a99b8e7bdb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2000-06-13  Eli Zaretskii <eliz@is.elta.co.il>
 
+       * frame.el (display-multi-frame-p, display-multi-font-p): New
+       defaliases for display-graphic-p.
+
        * hl-line.el: Fixed a typo in commentary.
 
 2000-06-13  Kenichi Handa  <handa@etl.go.jp>

diff --git a/src/ChangeLog b/src/ChangeLog
index 1a4c8fd69e0a0141f4ea706ca9ecadcc6abb8ec3..18f6431c93ea58cb4ae0584236153683d99fe1c0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-13  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * msdos.c (IT_write_glyphs): Don't use CODING_REQUIRE_ENCODING
+       macro, instead AND with CODING_REQUIRE_ENCODING_MASK.
+
 2000-06-13  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * msdos.h (EMACS_MSDOS_H): Renamed from MSDOS_H_.