diff options
| author | Eli Zaretskii | 2007-10-13 11:54:57 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2007-10-13 11:54:57 +0000 |
| commit | bc82f12000ee71f93572004267b05008df6a870e (patch) | |
| tree | 4b0b08e2e36a1a50f37d5764bf01db76a4277818 /src | |
| parent | 1e355d74ce3c823dd4134dadefb6795cb4098a3b (diff) | |
| download | emacs-bc82f12000ee71f93572004267b05008df6a870e.tar.gz emacs-bc82f12000ee71f93572004267b05008df6a870e.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 c928977d68b..528e793bf11 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-10 Patrick Mahan <mahan@mahan.org> (tiny change) | 6 | 2007-10-10 Patrick Mahan <mahan@mahan.org> (tiny change) |
| 2 | 7 | ||
| 3 | * macfns.c (x_create_tip_frame): Set terminal for frame. | 8 | * macfns.c (x_create_tip_frame): Set terminal for frame. |
diff --git a/src/msdos.c b/src/msdos.c index dc183def753..fc14be2705c 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; |