From: Gerd Moellmann <gerd@gnu.org>
Date: Fri, 6 Apr 2001 10:14:50 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.102~5
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=afa3935f3d651d3e787510c73caff28c7355dcb2;p=emacs.git

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

diff --git a/ChangeLog b/ChangeLog
index 41746411502..06541e66e97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-06  Gerd Moellmann  <gerd@gnu.org>
+
+	* make-dist: Handle leim/MISC-DIC.  Only include
+	`[a-zA-Z]*.{el,elc}' from leim/quail.
+
 2001-04-05  Gerd Moellmann  <gerd@gnu.org>
 
 	* Makefile.in (install-arch-indep): Remove .cvsignore files.
diff --git a/src/ChangeLog b/src/ChangeLog
index 6aadb3184e9..8c42d6fc349 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-04-06  Gerd Moellmann  <gerd@gnu.org>
 
+	* composite.h (COMPOSITION_VALID_P): Allow integers as cdrs of
+	PROP.
+
 	* xdisp.c (Qinhibit_eval_during_redisplay): Make it a Lisp_Object.
 
 2001-04-05  Gerd Moellmann  <gerd@gnu.org>