# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1110872887 0
# Node ID f131aee6a4fe7f6235e72bb40ad3e260ab721a51
# Parent  4536f307a2190ce0754523c8a4bbd697ebe038d3
*** empty log message ***

diff -r 4536f307a219 -r f131aee6a4fe lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Mar 15 07:47:25 2005 +0000
+++ b/lisp/ChangeLog	Tue Mar 15 07:48:07 2005 +0000
@@ -1,3 +1,10 @@
+2005-03-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* simple.el (normal-erase-is-backspace): Set default to t if
+	running on Mac.
+
+	* term/mac-win.el (function-key-map): Sync with x-win.el.
+
 2005-03-15  Kenichi Handa  <handa@m17n.org>
 
 	* international/mule-cmds.el (locale-language-names): Modify the
diff -r 4536f307a219 -r f131aee6a4fe src/ChangeLog
--- a/src/ChangeLog	Tue Mar 15 07:47:25 2005 +0000
+++ b/src/ChangeLog	Tue Mar 15 07:48:07 2005 +0000
@@ -1,3 +1,9 @@
+2005-03-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* macterm.c (keycode_to_xkeysym_table): Change mapping so that it
+	coincide with that in Apple X11 except `clear', `enter' on
+	laptops, and fn + `enter' on laptops.
+
 2005-03-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* xmenu.c (ENCODE_MENU_STRING): Explicitly use string_make_unibyte.