Mercurial > emacs
comparison src/keyboard.c @ 31877:517180d8eccd
(show_help_echo): Set help_echo_showing_p.
(read_char): If help-echo is showing, preserve the echo area
when redisplaying.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Mon, 25 Sep 2000 14:27:02 +0000 |
parents | 5732e757b20f |
children | 6a45a15137b0 |
comparison
equal
deleted
inserted
replaced
31876:de16d989722a | 31877:517180d8eccd |
---|---|
1984 message3_nolog (help, XSTRING (help)->size, | 1984 message3_nolog (help, XSTRING (help)->size, |
1985 STRING_MULTIBYTE (help)); | 1985 STRING_MULTIBYTE (help)); |
1986 unbind_to (count, Qnil); | 1986 unbind_to (count, Qnil); |
1987 } | 1987 } |
1988 else | 1988 else |
1989 message (0); | 1989 message (0); |
1990 } | 1990 } |
1991 | |
1992 help_echo_showing_p = STRINGP (help); | |
1991 } | 1993 } |
1992 } | 1994 } |
1993 | 1995 |
1994 | 1996 |
1995 | 1997 |
2169 swallow_events (0); /* may clear input_pending */ | 2171 swallow_events (0); /* may clear input_pending */ |
2170 | 2172 |
2171 /* Redisplay if no pending input. */ | 2173 /* Redisplay if no pending input. */ |
2172 while (!input_pending) | 2174 while (!input_pending) |
2173 { | 2175 { |
2174 redisplay (); | 2176 if (help_echo_showing_p && !EQ (selected_window, minibuf_window)) |
2177 redisplay_preserve_echo_area (); | |
2178 else | |
2179 redisplay (); | |
2175 | 2180 |
2176 if (!input_pending) | 2181 if (!input_pending) |
2177 /* Normal case: no input arrived during redisplay. */ | 2182 /* Normal case: no input arrived during redisplay. */ |
2178 break; | 2183 break; |
2179 | 2184 |