diff options
| author | Karoly Lorentey | 2006-05-20 10:32:11 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2006-05-20 10:32:11 +0000 |
| commit | aabd1a8b138a7f5907c3bb0bbd40932fa7b8e9fe (patch) | |
| tree | 7db1ed5481ec4ec6b43271d0ea57c032c22f60fc /src/macterm.c | |
| parent | 9f97e26d01003a17b861505d535c89ad73799b7e (diff) | |
| parent | 689840b9224725a0beae741aaaa325d7edb2244c (diff) | |
| download | emacs-aabd1a8b138a7f5907c3bb0bbd40932fa7b8e9fe.tar.gz emacs-aabd1a8b138a7f5907c3bb0bbd40932fa7b8e9fe.zip | |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-285
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-286
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-287
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-288
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-102
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-558
Diffstat (limited to 'src/macterm.c')
| -rw-r--r-- | src/macterm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/macterm.c b/src/macterm.c index beaecfdc790..68959758e98 100644 --- a/src/macterm.c +++ b/src/macterm.c | |||
| @@ -10333,6 +10333,7 @@ XTread_socket (sd, expected, hold_quit) | |||
| 10333 | break; | 10333 | break; |
| 10334 | 10334 | ||
| 10335 | case keyDown: | 10335 | case keyDown: |
| 10336 | case keyUp: | ||
| 10336 | case autoKey: | 10337 | case autoKey: |
| 10337 | { | 10338 | { |
| 10338 | int keycode = (er.message & keyCodeMask) >> 8; | 10339 | int keycode = (er.message & keyCodeMask) >> 8; |
| @@ -10354,6 +10355,8 @@ XTread_socket (sd, expected, hold_quit) | |||
| 10354 | != eventNotHandledErr) | 10355 | != eventNotHandledErr) |
| 10355 | break; | 10356 | break; |
| 10356 | #endif | 10357 | #endif |
| 10358 | if (er.what == keyUp) | ||
| 10359 | break; | ||
| 10357 | 10360 | ||
| 10358 | #if 0 | 10361 | #if 0 |
| 10359 | if (dpyinfo->x_focus_frame == NULL) | 10362 | if (dpyinfo->x_focus_frame == NULL) |