From: Kenichi Handa <handa@m17n.org>
Date: Wed, 29 Nov 2006 13:10:47 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-23.0.90~8295^2~649
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7faa8095342cd1b16f6d95d20cd27136789b755e;p=emacs.git

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

diff --git a/lisp/ChangeLog.unicode b/lisp/ChangeLog.unicode
index 05feff1222e..f11dfe03497 100644
--- a/lisp/ChangeLog.unicode
+++ b/lisp/ChangeLog.unicode
@@ -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 --git a/src/ChangeLog.unicode b/src/ChangeLog.unicode
index 642db7f9a77..d5d2505c2ef 100644
--- a/src/ChangeLog.unicode
+++ b/src/ChangeLog.unicode
@@ -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.