From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Tue, 15 Mar 2005 07:48:07 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~1800
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a7321976e81b4d7f56c8d06b063223e78220c4a6;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c63e730d0a0..1e288f81534 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index c7df4018ccd..f0f27785e3d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.