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

diff -r 7b70538ea11c -r cd317328ebb1 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Jan 22 08:28:15 2007 +0000
+++ b/lisp/ChangeLog	Mon Jan 22 08:28:34 2007 +0000
@@ -1,3 +1,13 @@
+2007-01-22  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* term/mac-win.el (mac-keyboard-modifier-mask-alist): New constant.
+	(mac-ae-keyboard-modifiers): New function.
+	(mac-handle-toolbar-switch-mode): Use it.
+	(mac-dnd-handle-drag-n-drop-event): Likewise.  Set action to `copy'
+	if keyboard modifiers on drop contain option key.
+	(mac-dnd-drop-data): Add optional argument `action'.
+	(special-event-map): Remove binding for M-drag-n-drop.
+
 2007-01-21  Guanpeng Xu  <herberteuler@hotmail.com>
 
 	* add-log.el (add-log-current-defun): Use CC Mode functions to
diff -r 7b70538ea11c -r cd317328ebb1 src/ChangeLog
--- a/src/ChangeLog	Mon Jan 22 08:28:15 2007 +0000
+++ b/src/ChangeLog	Mon Jan 22 08:28:34 2007 +0000
@@ -1,3 +1,9 @@
+2007-01-22  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* macselect.c [TARGET_API_MAC_CARBON] (mac_do_receive_drag): Don't
+	pass keyboard modifiers to mac_store_drag_event, but put them as
+	kEventParamKeyModifiers Apple event parameter.
+
 2007-01-21  Chong Yidong  <cyd@stupidchicken.com>
 
 	* xdisp.c (try_window): Revert previous change.