# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1164805847 0
# Node ID 798b321ef3603ab99a228c5060c94994223760ab
# Parent  ca120caa583899d760e3496c10ae0a02f5e5f2ef
*** empty log message ***

diff -r ca120caa5838 -r 798b321ef360 lisp/ChangeLog.unicode
--- a/lisp/ChangeLog.unicode	Wed Nov 29 13:10:10 2006 +0000
+++ b/lisp/ChangeLog.unicode	Wed Nov 29 13:10:47 2006 +0000
@@ -1,3 +1,8 @@
+2006-11-29  Kenichi Handa  <handa@m17n.org>
+
+	* mail/emacsbug.el (report-emacs-bug): Insert also the value of
+	XMODIFIERS.
+
 2006-11-28  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
 	* ps-print.el: Fix maintainer email.  Eliminate function declaration
diff -r ca120caa5838 -r 798b321ef360 src/ChangeLog.unicode
--- a/src/ChangeLog.unicode	Wed Nov 29 13:10:10 2006 +0000
+++ b/src/ChangeLog.unicode	Wed Nov 29 13:10:47 2006 +0000
@@ -1,5 +1,20 @@
 2006-11-29  Kenichi Handa  <handa@m17n.org>
 
+	* xftfont.c (ftfont_font_format): Extern declaration.
+
+	* frame.c (x_set_font): Fix the second arg to fs_query_fontset.
+
+	* xfont.c (xfont_driver): Initialize ftfont_driver.type by 0.
+	(xfont_list): Don't directly use Lisp_Object as an operand of &&.
+
+	* ftfont.c (ftfont_driver): Initialize ftfont_driver.type by 0.
+	(ftfont_font_format): Fix previous change.
+
+	* font.h (Ffont_xlfd_name): EXFUN it.
+
+	* font.c (font_parse_xlfd): Fix the array size of `f'.
+	(register_font_driver): Use EQ to compare driver->type.
+
 	* xfns.c (xic_create_xfontset2) [USE_FONT_BACKEND]: New function.
 	(create_frame_xic) [USE_FONT_BACKEND]: Call xic_create_xfontset2.
 	(xic_set_xfontset) [USE_FONT_BACKEND]: Likewise.