# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 1003921943 0
# Node ID 111fc7634b28be4c823be9b8ea12a7a536b97413
# Parent  568fe11a570e1df122b5eccdcdfb0a1e22769e15
*** empty log message ***

diff -r 568fe11a570e -r 111fc7634b28 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Oct 24 11:11:11 2001 +0000
+++ b/lisp/ChangeLog	Wed Oct 24 11:12:23 2001 +0000
@@ -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 -r 568fe11a570e -r 111fc7634b28 src/ChangeLog
--- a/src/ChangeLog	Wed Oct 24 11:11:11 2001 +0000
+++ b/src/ChangeLog	Wed Oct 24 11:12:23 2001 +0000
@@ -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