# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1202125422 0
# Node ID 36f5f0eec1b44711906366717f584ea0bc486219
# Parent  5b2a1921a62fcf7af37d7de1f3c86da9caba922a
*** empty log message ***

diff -r 5b2a1921a62f -r 36f5f0eec1b4 src/ChangeLog
--- a/src/ChangeLog	Mon Feb 04 11:43:00 2008 +0000
+++ b/src/ChangeLog	Mon Feb 04 11:43:42 2008 +0000
@@ -1,13 +1,15 @@
 2008-02-04  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* macterm.c [MAC_OSX] (fn_keycode_to_keycode_table): Add more entries
-	that ignores kEventKeyModifierFnMask.
+	that ignore kEventKeyModifierFnMask.
 	(XTread_socket) [MAC_OSX]: Move code for ignoring
 	kEventKeyModifierFnMask for some keys ...
 	(mac_mapped_modifiers) [MAC_OSX]: ... to here.  Add argument KEY_CODE.
 	All callers changed.
+	(mac_to_emacs_modifiers): New argument UNMAPPED_MODS.
+	All callers changed.
 	(mac_quit_char_key_p, XTread_socket): Get Emacs modifiers from
-	mapped modifiers.
+	mapped modifiers together with original ones.
 
 2008-02-01  Kenichi Handa  <handa@ni.aist.go.jp>