diff options
| author | YAMAMOTO Mitsuharu | 2006-05-27 08:46:03 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2006-05-27 08:46:03 +0000 |
| commit | 412f3f1859b20e13d0d16f55852975c7ed74fa53 (patch) | |
| tree | 1b35b3f7fa35a7e0459f96c9e32df7bb5b84d86a /src | |
| parent | 2a7ee2b3492bb0513951fafaa680e867270051bb (diff) | |
| download | emacs-412f3f1859b20e13d0d16f55852975c7ed74fa53.tar.gz emacs-412f3f1859b20e13d0d16f55852975c7ed74fa53.zip | |
(mac_handle_apple_event): Return
errAEEventNotHandled if key binding is not found.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/macselect.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8ba00b65ddd..5a0b7621643 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2006-05-27 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | ||
| 2 | |||
| 3 | * macselect.c (mac_handle_apple_event): Return | ||
| 4 | errAEEventNotHandled if key binding is not found. | ||
| 5 | |||
| 1 | 2006-05-26 Eli Zaretskii <eliz@gnu.org> | 6 | 2006-05-26 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * emacs.c (main) [PROFILING]: Enable also for __MINGW32__. | 8 | * emacs.c (main) [PROFILING]: Enable also for __MINGW32__. |
| @@ -86,7 +91,7 @@ | |||
| 86 | (mac_handle_apple_event_1): New function. | 91 | (mac_handle_apple_event_1): New function. |
| 87 | (mac_handle_apple_event): Use it. Don't process previously | 92 | (mac_handle_apple_event): Use it. Don't process previously |
| 88 | suspended events. | 93 | suspended events. |
| 89 | (cleanup_suspended_apple_events, get_suspension_id)n | 94 | (cleanup_suspended_apple_events, get_suspension_id) |
| 90 | (cleanup_all_suspended_apple_events): New functions. | 95 | (cleanup_all_suspended_apple_events): New functions. |
| 91 | (init_apple_event_handler): Call cleanup_all_suspended_apple_events | 96 | (init_apple_event_handler): Call cleanup_all_suspended_apple_events |
| 92 | at exit. | 97 | at exit. |
diff --git a/src/macselect.c b/src/macselect.c index 40a3db9ca08..3afea1e9813 100644 --- a/src/macselect.c +++ b/src/macselect.c | |||
| @@ -1159,6 +1159,8 @@ mac_handle_apple_event (apple_event, reply, refcon) | |||
| 1159 | err = mac_handle_apple_event_1 (class_key, id_key, | 1159 | err = mac_handle_apple_event_1 (class_key, id_key, |
| 1160 | apple_event, reply); | 1160 | apple_event, reply); |
| 1161 | } | 1161 | } |
| 1162 | else | ||
| 1163 | err = errAEEventNotHandled; | ||
| 1162 | } | 1164 | } |
| 1163 | if (err == noErr) | 1165 | if (err == noErr) |
| 1164 | return noErr; | 1166 | return noErr; |