*** empty log message ***

diff --git a/src/ChangeLog b/src/ChangeLog
index e5befabeda70d90e670f7dcc93e55631cec2c4e7..77e7dc86bdb1ab4e3416ed93c7a15cbde36a2c33 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-22  Kenichi Handa  <handa@m17n.org>
+
+       * w32font.c (w32font_open_internal): Call Ffont_xlfd_name with
+       two args.
+
+       * xfaces.c (x_update_menu_appearance): Call Ffont_xlfd_name with
+       two args.
+
 2008-05-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * minibuf.c (keys_of_minibuf): Delete.

diff --git a/src/w32font.c b/src/w32font.c
index 4ce9e4c8459a6a5f1660ba863499f576fe0e54e5..273d98a40e398aab7becd2a04df8e689c7b9a828 100644 (file)
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -898,7 +898,7 @@ w32font_open_internal (f, font_entity, pixel_size, font_object)
      name to be usable in x-list-fonts. Eventually we expect to change
      x-list-fonts and other places that use fonts so that this can be
      an fcname or similar.  */
-  font->props[FONT_NAME_INDEX] = Ffont_xlfd_name (font_object);
+  font->props[FONT_NAME_INDEX] = Ffont_xlfd_name (font_object, Qnil);
 
   return 1;
 }