aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Choi2002-08-25 16:40:40 +0000
committerAndrew Choi2002-08-25 16:40:40 +0000
commit19580e2cf6bb7e52f0aba60aca078349d8f1b8fa (patch)
tree2af1a9f9565e1aad7a46d44b144232ee5b97342b
parent476cf0130b8fc2a82bcdb7f05e43bbc0bebbf841 (diff)
downloademacs-19580e2cf6bb7e52f0aba60aca078349d8f1b8fa.tar.gz
emacs-19580e2cf6bb7e52f0aba60aca078349d8f1b8fa.zip
2002-08-25 Andrew Choi <akochoi@shaw.ca>
* macterm.c (XTread_socket): Remove code to call SendEventToEventTarget for keys with command modifiers when mac_command_key_is_meta is nil.
-rw-r--r--src/ChangeLog6
-rw-r--r--src/macterm.c10
2 files changed, 6 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 97e75c1992a..be8a9d9d3a7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12002-08-25 Andrew Choi <akochoi@shaw.ca>
2
3 * macterm.c (XTread_socket): Remove code to call
4 SendEventToEventTarget for keys with command modifiers when
5 mac_command_key_is_meta is nil.
6
12002-08-24 Andreas Schwab <schwab@suse.de> 72002-08-24 Andreas Schwab <schwab@suse.de>
2 8
3 * eval.c (Fdefvar): Fix last change. 9 * eval.c (Fdefvar): Fix last change.
diff --git a/src/macterm.c b/src/macterm.c
index e285480a9e9..dacdd6c8b91 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -12960,16 +12960,6 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected)
12960 bufp->code = KeyTranslate (kchr_ptr, new_keycode, 12960 bufp->code = KeyTranslate (kchr_ptr, new_keycode,
12961 &some_state) & 0xff; 12961 &some_state) & 0xff;
12962 } 12962 }
12963#if USE_CARBON_EVENTS
12964 else if (er.modifiers & cmdKey &&
12965 (NILP (Vmac_command_key_is_meta)))
12966 {
12967 /* If this is a command key (and we are not overriding it),
12968 send back to the operating system */
12969 SendEventToEventTarget (eventRef, GetEventDispatcherTarget ());
12970 break;
12971 }
12972#endif
12973 else 12963 else
12974 bufp->code = er.message & charCodeMask; 12964 bufp->code = er.message & charCodeMask;
12975 bufp->kind = ASCII_KEYSTROKE_EVENT; 12965 bufp->kind = ASCII_KEYSTROKE_EVENT;