diff options
| author | Gerd Moellmann | 2001-02-05 15:48:00 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2001-02-05 15:48:00 +0000 |
| commit | 7a58ab59f4d02fc738e7a02c9da5698f83e28a29 (patch) | |
| tree | 7dd12abc4bff6834f4803edca6166026e4dbf378 | |
| parent | e6297e7db4c610ebeecc45903e562e506152e8ce (diff) | |
| download | emacs-7a58ab59f4d02fc738e7a02c9da5698f83e28a29.tar.gz emacs-7a58ab59f4d02fc738e7a02c9da5698f83e28a29.zip | |
(x_display_and_set_cursor): Check for the focus
frame's selected window instead of selected_window.
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/xterm.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f43f38997cb..ab1de851f17 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2001-02-05 Gerd Moellmann <gerd@gnu.org> | 1 | 2001-02-05 Gerd Moellmann <gerd@gnu.org> |
| 2 | 2 | ||
| 3 | * xterm.c (x_display_and_set_cursor): Check for the focus | ||
| 4 | frame's selected window instead of selected_window. | ||
| 5 | |||
| 3 | * xdisp.c (try_scrolling): If point is in the line below the | 6 | * xdisp.c (try_scrolling): If point is in the line below the |
| 4 | window, make sure to move the iterator at least a canonical | 7 | window, make sure to move the iterator at least a canonical |
| 5 | char height down. | 8 | char height down. |
diff --git a/src/xterm.c b/src/xterm.c index 3d0b151370d..14a34bd2eca 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -10877,8 +10877,8 @@ x_display_and_set_cursor (w, on, hpos, vpos, x, y) | |||
| 10877 | } | 10877 | } |
| 10878 | else | 10878 | else |
| 10879 | { | 10879 | { |
| 10880 | if (w != XWINDOW (selected_window) | 10880 | if (f != FRAME_X_DISPLAY_INFO (f)->x_highlight_frame |
| 10881 | || f != FRAME_X_DISPLAY_INFO (f)->x_highlight_frame) | 10881 | || w != XWINDOW (f->selected_window)) |
| 10882 | { | 10882 | { |
| 10883 | extern int cursor_in_non_selected_windows; | 10883 | extern int cursor_in_non_selected_windows; |
| 10884 | 10884 | ||