*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f3e60866b8c3c0c9fe32456a50ec72fbb86fde06..4c7fb03f3014c34b9ea74496c72f60284593022d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/man/ChangeLog b/man/ChangeLog
index 8e6077263b49ef4244481097a2803fa1fca02e70..f9acbc4be6a79b7c9078cfcf578a7803894bd43a 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index e6ed510a81cf19ef38659e5f740d318973f5923d..291cba8a2b8425f8f38e36e964f7edb563133018 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.