Mercurial > emacs
comparison src/keyboard.c @ 35336:002c02db42d3
Call redisplay_preserve_echo_area with additional arg.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Tue, 16 Jan 2001 12:42:22 +0000 |
parents | d473294a0124 |
children | 66fbfa369f3e |
comparison
equal
deleted
inserted
replaced
35335:b5a39d371511 | 35336:002c02db42d3 |
---|---|
2219 | 2219 |
2220 /* Redisplay if no pending input. */ | 2220 /* Redisplay if no pending input. */ |
2221 while (!input_pending) | 2221 while (!input_pending) |
2222 { | 2222 { |
2223 if (help_echo_showing_p && !EQ (selected_window, minibuf_window)) | 2223 if (help_echo_showing_p && !EQ (selected_window, minibuf_window)) |
2224 redisplay_preserve_echo_area (); | 2224 redisplay_preserve_echo_area (5); |
2225 else | 2225 else |
2226 redisplay (); | 2226 redisplay (); |
2227 | 2227 |
2228 if (!input_pending) | 2228 if (!input_pending) |
2229 /* Normal case: no input arrived during redisplay. */ | 2229 /* Normal case: no input arrived during redisplay. */ |
3037 input has been processed. If the only input available was | 3037 input has been processed. If the only input available was |
3038 the sort that we have just disabled, then we need to call | 3038 the sort that we have just disabled, then we need to call |
3039 redisplay. */ | 3039 redisplay. */ |
3040 if (!readable_events (1)) | 3040 if (!readable_events (1)) |
3041 { | 3041 { |
3042 redisplay_preserve_echo_area (); | 3042 redisplay_preserve_echo_area (6); |
3043 get_input_pending (&input_pending, 1); | 3043 get_input_pending (&input_pending, 1); |
3044 } | 3044 } |
3045 } | 3045 } |
3046 return Qnil; | 3046 return Qnil; |
3047 } | 3047 } |
3808 | 3808 |
3809 old_timers_run = timers_run; | 3809 old_timers_run = timers_run; |
3810 get_input_pending (&input_pending, 1); | 3810 get_input_pending (&input_pending, 1); |
3811 | 3811 |
3812 if (timers_run != old_timers_run && do_display) | 3812 if (timers_run != old_timers_run && do_display) |
3813 redisplay_preserve_echo_area (); | 3813 redisplay_preserve_echo_area (7); |
3814 } | 3814 } |
3815 | 3815 |
3816 static EMACS_TIME timer_idleness_start_time; | 3816 static EMACS_TIME timer_idleness_start_time; |
3817 | 3817 |
3818 /* Record the start of when Emacs is idle, | 3818 /* Record the start of when Emacs is idle, |
8917 } | 8917 } |
8918 | 8918 |
8919 DEFUN ("read-key-sequence-vector", Fread_key_sequence_vector, | 8919 DEFUN ("read-key-sequence-vector", Fread_key_sequence_vector, |
8920 Sread_key_sequence_vector, 1, 5, 0, | 8920 Sread_key_sequence_vector, 1, 5, 0, |
8921 "Like `read-key-sequence' but always return a vector.") | 8921 "Like `read-key-sequence' but always return a vector.") |
8922 /* Don't break the following line for documentation's sake. */ | 8922 (prompt, continue_echo, dont_downcase_last, can_return_switch_frame, |
8923 (prompt, continue_echo, dont_downcase_last, can_return_switch_frame, command_loop) | 8923 command_loop) |
8924 Lisp_Object prompt, continue_echo, dont_downcase_last; | 8924 Lisp_Object prompt, continue_echo, dont_downcase_last; |
8925 Lisp_Object can_return_switch_frame, command_loop; | 8925 Lisp_Object can_return_switch_frame, command_loop; |
8926 { | 8926 { |
8927 Lisp_Object keybuf[30]; | 8927 Lisp_Object keybuf[30]; |
8928 register int i; | 8928 register int i; |
9286 if (!input_pending) | 9286 if (!input_pending) |
9287 get_input_pending (&input_pending, 1); | 9287 get_input_pending (&input_pending, 1); |
9288 | 9288 |
9289 if (old_timers_run != timers_run && do_display) | 9289 if (old_timers_run != timers_run && do_display) |
9290 { | 9290 { |
9291 redisplay_preserve_echo_area (); | 9291 redisplay_preserve_echo_area (8); |
9292 /* The following fixes a bug when using lazy-lock with | 9292 /* The following fixes a bug when using lazy-lock with |
9293 lazy-lock-defer-on-the-fly set to t, i.e. when fontifying | 9293 lazy-lock-defer-on-the-fly set to t, i.e. when fontifying |
9294 from an idle timer function. The symptom of the bug is that | 9294 from an idle timer function. The symptom of the bug is that |
9295 the cursor sometimes doesn't become visible until the next X | 9295 the cursor sometimes doesn't become visible until the next X |
9296 event is processed. --gerd. */ | 9296 event is processed. --gerd. */ |