diff options
| author | Gerd Moellmann | 2000-06-15 22:51:37 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2000-06-15 22:51:37 +0000 |
| commit | a871441db10a5ec54f72f2b569f4a2096786659d (patch) | |
| tree | 7a02c98275b27c3f74654bd886e01b238f31b22e /src | |
| parent | 451ec4e3a348ac08abf00becf7234550dc245c0c (diff) | |
| download | emacs-a871441db10a5ec54f72f2b569f4a2096786659d.tar.gz emacs-a871441db10a5ec54f72f2b569f4a2096786659d.zip | |
(update_frame_1): Handle case that cursor vpos is
out of bounds.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/dispnew.c | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7ec49c531c4..e3a423e7eae 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2000-06-16 Gerd Moellmann <gerd@gnu.org> | ||
| 2 | |||
| 3 | * dispnew.c (update_frame_1): Handle case that cursor vpos is | ||
| 4 | out of bounds. | ||
| 5 | |||
| 1 | 2000-06-15 Eli Zaretskii <eliz@is.elta.co.il> | 6 | 2000-06-15 Eli Zaretskii <eliz@is.elta.co.il> |
| 2 | 7 | ||
| 3 | * unexec.c (toplevel): Fix last change, so as not to deprive MSDOS | 8 | * unexec.c (toplevel): Fix last change, so as not to deprive MSDOS |
diff --git a/src/dispnew.c b/src/dispnew.c index c114849bb07..da538cc658e 100644 --- a/src/dispnew.c +++ b/src/dispnew.c | |||
| @@ -4724,7 +4724,13 @@ update_frame_1 (f, force_p, inhibit_id_p) | |||
| 4724 | /* We have only one cursor on terminal frames. Use it to | 4724 | /* We have only one cursor on terminal frames. Use it to |
| 4725 | display the cursor of the selected window. */ | 4725 | display the cursor of the selected window. */ |
| 4726 | struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f)); | 4726 | struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f)); |
| 4727 | if (w->cursor.vpos >= 0) | 4727 | if (w->cursor.vpos >= 0 |
| 4728 | /* The cursor vpos may be temporarily out of bounds | ||
| 4729 | in the following situation: There is one window, | ||
| 4730 | with the cursor in the lower half of it. The window | ||
| 4731 | is split, and a message causes a redisplay before | ||
| 4732 | a new cursor position has been computed. */ | ||
| 4733 | && w->cursor.vpos < XFASTINT (w->height)) | ||
| 4728 | { | 4734 | { |
| 4729 | int x = WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos); | 4735 | int x = WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos); |
| 4730 | int y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | 4736 | int y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); |