diff options
author | Karl Heuer <kwzh@gnu.org> | 1995-05-02 02:17:21 +0000 |
---|---|---|
committer | Karl Heuer <kwzh@gnu.org> | 1995-05-02 02:17:21 +0000 |
commit | 94bdc6cd746d3c859a0458370a0b0fd0a596aa03 (patch) | |
tree | 93447ff190179fe51271ed3820867c072720844b /src/xdisp.c | |
parent | 92c1e08ea20259adc13a36e372dd48440a54a53c (diff) | |
download | emacs-94bdc6cd746d3c859a0458370a0b0fd0a596aa03.tar.gz |
(display_text_line): Don't move the cursor if it's supposed to
be in the echo area.
(echo_area_display): Put cursor in echo area if appropriate.
Diffstat (limited to 'src/xdisp.c')
-rw-r--r-- | src/xdisp.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 1fa29343966..0d25c7f5155 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -567,6 +567,8 @@ echo_area_display () 0, 0, 0, 0, FRAME_WIDTH (f)); /* If desired cursor location is on this line, put it at end of text */ + if (cursor_in_echo_area) + FRAME_CURSOR_Y (f) = vpos; if (FRAME_CURSOR_Y (f) == vpos) FRAME_CURSOR_X (f) = FRAME_DESIRED_GLYPHS (f)->used[vpos]; @@ -2803,8 +2805,12 @@ display_text_line (w, start, vpos, hpos, taboffset) cursor_hpos += XFASTINT (w->left); if (w == XWINDOW (FRAME_SELECTED_WINDOW (f))) { - FRAME_CURSOR_Y (f) = cursor_vpos; - FRAME_CURSOR_X (f) = cursor_hpos; + if (!(cursor_in_echo_area && FRAME_HAS_MINIBUF_P (f) + && EQ (FRAME_MINIBUF_WINDOW (f), minibuf_window))) + { + FRAME_CURSOR_Y (f) = cursor_vpos; + FRAME_CURSOR_X (f) = cursor_hpos; + } if (w == XWINDOW (selected_window)) { |