summaryrefslogtreecommitdiff
path: root/src/xdisp.c
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>2002-12-22 21:59:20 +0000
committerRichard M. Stallman <rms@gnu.org>2002-12-22 21:59:20 +0000
commitc67af3f49f5dfac6d7a0cfe8643422c97b8909fc (patch)
treef72f662ec2ecf4cb59da6d600ca519db25cc1f03 /src/xdisp.c
parentd17551171b121c360874a9710e1fee7dddffeb66 (diff)
downloademacs-c67af3f49f5dfac6d7a0cfe8643422c97b8909fc.tar.gz
(try_cursor_movement): Don't call try_window here.
(redisplay_window): Never redisplay minibuffer when inactive.
Diffstat (limited to 'src/xdisp.c')
-rw-r--r--src/xdisp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index b795a9ff998..1feb3830b25 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10111,7 +10111,6 @@ try_cursor_movement (window, startp, scroll_step)
else
{
set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0);
- try_window (window, startp);
if (!make_cursor_line_fully_visible (w))
rc = CURSOR_MOVEMENT_MUST_SCROLL;
else
@@ -10194,7 +10193,8 @@ redisplay_window (window, just_this_one_p)
/* We've already displayed the echo area glyphs in this window. */
goto finish_scroll_bars;
}
- else if (w != XWINDOW (minibuf_window))
+ else if (w != XWINDOW (minibuf_window)
+ || minibuf_level == 0)
{
/* W is a mini-buffer window, but it's not the currently
active one, so clear it. */