*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 45e65ce841766086a33d626d4dda41b4748f93c8..85c023039be4a69d9bab99fa75ae8096f931bb64 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index a936f0345c118ebd7b94dd5a41d5b18b4cc80f50..6b1491203a5e28d6671a61712c7c4e05f2753c1d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.