From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 13 Jun 2000 13:16:43 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.90~3350
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a704139d980cba7e3bc63d3db14fdc434cb7b32b;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 78614367d1d..e722f4c643c 100644
--- 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 1a4c8fd69e0..18f6431c93e 100644
--- 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_.