diff options
| author | Miles Bader <miles@gnu.org> | 2007-01-26 06:16:11 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-01-26 06:16:11 +0000 |
| commit | c0466914ba3ad88c402b0301646b4b5db8aeb913 (patch) | |
| tree | 964d8df324ab5f46872dfedc92ccea9fe50a1441 /src/macselect.c | |
| parent | c97a3f22ed5841f1c8bcdbb80df2bd49635c6a56 (diff) | |
| parent | 58f8a3f97bd49484d0eb4f83a70662ded0daf9cc (diff) | |
| download | emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.tar.gz emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.tar.bz2 emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 586-614)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- Merge from erc--main--0
- Make byte compiler correctly write circular constants
* gnus--rel--5.10 (patch 186-196)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
Diffstat (limited to 'src/macselect.c')
| -rw-r--r-- | src/macselect.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/macselect.c b/src/macselect.c index 8d15db24144..8e86c7651e2 100644 --- a/src/macselect.c +++ b/src/macselect.c @@ -1,5 +1,5 @@ /* Selection processing for Emacs on Mac OS. - Copyright (C) 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -1390,7 +1390,7 @@ nil, which means the event is already resumed or expired. */) ae = *p; *p = (*p)->next; if (INTEGERP (error_code) - && ae->apple_event.descriptorType != typeNull) + && ae->reply.descriptorType != typeNull) { SInt32 errn = XINT (error_code); @@ -1562,10 +1562,17 @@ mac_do_receive_drag (window, refcon, drag) GlobalToLocal (&mouse_pos); err = GetDragModifiers (drag, NULL, NULL, &modifiers); } + if (err == noErr) + { + UInt32 key_modifiers = modifiers; + + err = AEPutParamPtr (&apple_event, kEventParamKeyModifiers, + typeUInt32, &key_modifiers, sizeof (UInt32)); + } if (err == noErr) { - mac_store_drag_event (window, mouse_pos, modifiers, &apple_event); + mac_store_drag_event (window, mouse_pos, 0, &apple_event); AEDisposeDesc (&apple_event); mac_wakeup_from_rne (); return noErr; |