From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 24 Oct 2001 11:12:23 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~19206
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bdbdebff2028c24100ee88408807681ce7f2fe7a;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dc61cb8a8de..93fe4f30b4b 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  Stefan Monnier  <monnier@cs.yale.edu>
 
 	* uniquify.el (uniquify-get-proposed-name): Fix (.. "usr" "/usr" 0).
diff --git a/src/ChangeLog b/src/ChangeLog
index 4669e84f58d..9f5e5f3a3f7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -8,6 +8,8 @@
 
 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