diff options
| author | Eli Zaretskii | 2007-10-13 11:25:52 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2007-10-13 11:25:52 +0000 |
| commit | 543bb3689e630e284a57b654f2075d30e632ce63 (patch) | |
| tree | c4054cc3373c388ca4d4e3ed7c51c1a3c6191c1f /src | |
| parent | fe6dcbf6cbadc3199b79a449921c5bf4c868b5da (diff) | |
| download | emacs-543bb3689e630e284a57b654f2075d30e632ce63.tar.gz emacs-543bb3689e630e284a57b654f2075d30e632ce63.zip | |
(dos_rawgetc): Undo last change (there's no ``leaving selected frame''
on MSDOS).
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/msdos.c | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e6c3e1d40a6..b42c75ab75a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-10-13 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * msdos.c (dos_rawgetc): Undo last change (there's no ``leaving | ||
| 4 | selected frame'' on MSDOS). | ||
| 5 | |||
| 1 | 2007-10-12 Martin Rudalics <rudalics@gmx.at> | 6 | 2007-10-12 Martin Rudalics <rudalics@gmx.at> |
| 2 | 7 | ||
| 3 | * frame.c (Qexplicit_name): New variable. | 8 | * frame.c (Qexplicit_name): New variable. |
diff --git a/src/msdos.c b/src/msdos.c index 2bac19e6592..ef65597f7e7 100644 --- a/src/msdos.c +++ b/src/msdos.c | |||
| @@ -3393,13 +3393,7 @@ dos_rawgetc () | |||
| 3393 | it is active. */ | 3393 | it is active. */ |
| 3394 | if (WINDOWP (mouse_window) | 3394 | if (WINDOWP (mouse_window) |
| 3395 | && !EQ (mouse_window, last_mouse_window) | 3395 | && !EQ (mouse_window, last_mouse_window) |
| 3396 | && !EQ (window, selected_window) | 3396 | && !EQ (mouse_window, selected_window)) |
| 3397 | /* For click-to-focus window managers | ||
| 3398 | create event iff we don't leave the | ||
| 3399 | selected frame. */ | ||
| 3400 | && (focus_follows_mouse | ||
| 3401 | || (EQ (XWINDOW (window)->frame, | ||
| 3402 | XWINDOW (selected_window)->frame)))) | ||
| 3403 | { | 3397 | { |
| 3404 | event.kind = SELECT_WINDOW_EVENT; | 3398 | event.kind = SELECT_WINDOW_EVENT; |
| 3405 | event.frame_or_window = mouse_window; | 3399 | event.frame_or_window = mouse_window; |