# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1146898366 0
# Node ID 12baf8c4ffbb0476b833574272f1a7dadc79f30e
# Parent  7c25b386a4c3298860191638ca43771e618f81ab
*** empty log message ***

diff -r 7c25b386a4c3 -r 12baf8c4ffbb lisp/ChangeLog
--- a/lisp/ChangeLog	Sat May 06 06:52:24 2006 +0000
+++ b/lisp/ChangeLog	Sat May 06 06:52:46 2006 +0000
@@ -1,3 +1,8 @@
+2006-05-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* term/mac-win.el: (mac-utxt-to-string): Don't make adjustment for
+	MacJapanese if text is ASCII-only.
+
 2006-05-06  Nick Roberts  <nickrob@snap.net.nz>
 
 	* progmodes/gdb-ui.el (gdb-goto-breakpoint): Use or instead of
@@ -85,9 +90,9 @@
 	* term/mac-win.el: (mac-utxt-to-string, mac-string-to-utxt)
 	(mac-TEXT-to-string, mac-string-to-TEXT, mac-furl-to-string)
 	(mac-TIFF-to-string): New functions.
-	(mac-text-encoding-mac-japanese-basic-variant):	New constant.
 	(x-get-selection, x-selection-value)
 	(mac-select-convert-to-string): Use them.
+	(mac-text-encoding-mac-japanese-basic-variant):	New constant.
 	(mac-dnd-types-alist): New customization variable.
 	(mac-dnd-handle-furl, mac-dnd-handle-hfs, mac-dnd-insert-utxt)
 	(mac-dnd-insert-TEXT, mac-dnd-insert-TIFF, mac-dnd-drop-data)
diff -r 7c25b386a4c3 -r 12baf8c4ffbb man/ChangeLog
--- a/man/ChangeLog	Sat May 06 06:52:24 2006 +0000
+++ b/man/ChangeLog	Sat May 06 06:52:46 2006 +0000
@@ -1,3 +1,8 @@
+2006-05-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* macos.texi (Mac Input): Mention input from Character Palette.
+	(Mac Font Specs): Fix typo.
+
 2006-05-05  Richard Stallman  <rms@gnu.org>
 
 	* files.texi (Diff Mode): Minor cleanup.
diff -r 7c25b386a4c3 -r 12baf8c4ffbb src/ChangeLog
--- a/src/ChangeLog	Sat May 06 06:52:24 2006 +0000
+++ b/src/ChangeLog	Sat May 06 06:52:46 2006 +0000
@@ -1,3 +1,11 @@
+2006-05-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* image.c (Qduration) [MAC_OS]: New variable.
+	(syms_of_image) [MAC_OS]: Intern and staticpro it.
+	[MAC_OS] (gif_load): Save image extension data in img->data.lisp_val.
+	[MAC_OSX] (image_load_quartz2d): Use cfstring_create_with_utf8_cstring
+	instead of cfstring_create_with_string.
+
 2006-05-06  Kim F. Storm  <storm@cua.dk>
 
 	* .gdbinit (xframe): Print frame name.