From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 24 Oct 2001 11:13:25 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-21.2~473
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=70cc9b64a19176552052a5d4cf414e766802fda5;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e9852348def..5adb997df94 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-24  Gerd Moellmann  <gerd@gnu.org>
+
+	* international/fontset.el (x-must-resolve-font-name): New
+	function.
+	(x-complement-fontset-spec): Use it.
+
 2001-10-23  Gerd Moellmann  <gerd@gnu.org>
 
 	* info.el (Info-fontify-node): Bind doun-mouse-{1,2} instead
diff --git a/src/ChangeLog b/src/ChangeLog
index 1d2291c2c8e..f6bc6515507 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2001-10-24  Gerd Moellmann  <gerd@gnu.org>
 
+	* xdisp.c: Change #ifdef GLYPH_DEBUG to #if.
+	
 	* xdisp.c (try_window_reusing_current_matrix): Use
 	row_containing_pos.
 	(row_containing_pos): Take additional argument DY.  Treat