# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1145606237 0
# Node ID 50b254bd63de1f06954b8731385deb92c9ca34ce
# Parent  6188dfce9d77a841e64499e799cad5c247fd8e51
*** empty log message ***

diff -r 6188dfce9d77 -r 50b254bd63de src/ChangeLog
--- a/src/ChangeLog	Fri Apr 21 07:56:57 2006 +0000
+++ b/src/ChangeLog	Fri Apr 21 07:57:17 2006 +0000
@@ -1,3 +1,18 @@
+2006-04-21  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* image.c [MAC_OS] (xpm_load_image): Fill in background field
+	while we have ximg handy.
+
+	* macmenu.c (restore_menu_items, save_menu_items): New functions
+	from xmenu.c.
+	(set_frame_menubar, digest_single_submenu): Apply 2006-04-18
+	changes for xmenu.c.
+
+	* macterm.c (x_per_char_metric): Return NULL if glyph width is 0.
+	(add_mac_font_name): New function.
+	(init_font_name_table): Use it.  Adopt the first found font from
+	those having the same family name.
+
 2006-04-21  Nick Roberts  <nickrob@snap.net.nz>
 
 	* xdisp.c (note_mouse_highlight): Use build_string.
@@ -51,8 +66,8 @@
 
 	* macterm.c (XCreateGC, x_per_char_metric, xlfdpat_create)
 	(init_font_name_table, init_font_name_table, mac_do_list_fonts)
-	(XLoadQueryFont, mac_store_apple_event): Don't check
-	return value of xmalloc.
+	(XLoadQueryFont, mac_store_apple_event): Don't check return value
+	of xmalloc.
 
 2006-04-17  Kim F. Storm  <storm@cua.dk>