diff options
| author | Gerd Moellmann | 2000-11-30 21:57:27 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2000-11-30 21:57:27 +0000 |
| commit | 31b6671b0f630bb35cc964eaa49bc0404b6651e3 (patch) | |
| tree | 527f762836d2eaa9e560e85038b0bfef61848859 /src | |
| parent | eccc05db421c45a9d55d20e5f80d53ce2e10ace8 (diff) | |
| download | emacs-31b6671b0f630bb35cc964eaa49bc0404b6651e3.tar.gz emacs-31b6671b0f630bb35cc964eaa49bc0404b6651e3.zip | |
(echo_area_display): If cursor is in the echo area, make
sure that the next redisplay displays the minibuffer, so that
the cursor will be replaced with what the minibuffer wants.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ba18459e58c..4167ecf40b0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2000-11-30 Gerd Moellmann <gerd@gnu.org> | 1 | 2000-11-30 Gerd Moellmann <gerd@gnu.org> |
| 2 | 2 | ||
| 3 | * xdisp.c (echo_area_display): If cursor is in the echo area, make | ||
| 4 | sure that the next redisplay displays the minibuffer, so that | ||
| 5 | the cursor will be replaced with what the minibuffer wants. | ||
| 6 | |||
| 3 | * xterm.c: Test USE_TOOLKIT_SCROLL_BARS everywhere with #ifdef and | 7 | * xterm.c: Test USE_TOOLKIT_SCROLL_BARS everywhere with #ifdef and |
| 4 | #ifndef instead of using #if. | 8 | #ifndef instead of using #if. |
| 5 | (XTread_socket) [USE_MOTIF] <KeyPress>: Call XmIsScrollBar only if | 9 | (XTread_socket) [USE_MOTIF] <KeyPress>: Call XmIsScrollBar only if |
diff --git a/src/xdisp.c b/src/xdisp.c index 15e52cde5aa..0ea22b6387e 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -6631,6 +6631,12 @@ echo_area_display (update_frame_p) | |||
| 6631 | } | 6631 | } |
| 6632 | else | 6632 | else |
| 6633 | update_frame (f, 1, 1); | 6633 | update_frame (f, 1, 1); |
| 6634 | |||
| 6635 | /* If cursor is in the echo area, make sure that the next | ||
| 6636 | redisplay displays the minibuffer, so that the cursor will | ||
| 6637 | be replaced with what the minibuffer wants. */ | ||
| 6638 | if (cursor_in_echo_area) | ||
| 6639 | ++windows_or_buffers_changed; | ||
| 6634 | } | 6640 | } |
| 6635 | } | 6641 | } |
| 6636 | else if (!EQ (mini_window, selected_window)) | 6642 | else if (!EQ (mini_window, selected_window)) |