diff options
| author | Gerd Moellmann | 2001-01-16 12:42:22 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2001-01-16 12:42:22 +0000 |
| commit | 3007ebfbc762b66111961bf04707e1f85efc2d00 (patch) | |
| tree | f151feca14f952cd2f2dcf5409cff8dd240ed1ea /src | |
| parent | 69d1478a7986a6c2b69e3e0dc1e23bbf871beb21 (diff) | |
| download | emacs-3007ebfbc762b66111961bf04707e1f85efc2d00.tar.gz emacs-3007ebfbc762b66111961bf04707e1f85efc2d00.zip | |
Call redisplay_preserve_echo_area with additional arg.
Diffstat (limited to 'src')
| -rw-r--r-- | src/callproc.c | 2 | ||||
| -rw-r--r-- | src/dispnew.c | 2 | ||||
| -rw-r--r-- | src/fns.c | 4 | ||||
| -rw-r--r-- | src/keyboard.c | 12 | ||||
| -rw-r--r-- | src/process.c | 14 | ||||
| -rw-r--r-- | src/sunfns.c | 4 | ||||
| -rw-r--r-- | src/sysdep.c | 2 | ||||
| -rw-r--r-- | src/vmsproc.c | 2 | ||||
| -rw-r--r-- | src/xselect.c | 6 |
9 files changed, 24 insertions, 24 deletions
diff --git a/src/callproc.c b/src/callproc.c index 9ba459f992a..59de2393586 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -836,7 +836,7 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") | |||
| 836 | if (first) | 836 | if (first) |
| 837 | prepare_menu_bars (); | 837 | prepare_menu_bars (); |
| 838 | first = 0; | 838 | first = 0; |
| 839 | redisplay_preserve_echo_area (); | 839 | redisplay_preserve_echo_area (1); |
| 840 | } | 840 | } |
| 841 | immediate_quit = 1; | 841 | immediate_quit = 1; |
| 842 | QUIT; | 842 | QUIT; |
diff --git a/src/dispnew.c b/src/dispnew.c index b4a1dabc694..f9d9fb2d856 100644 --- a/src/dispnew.c +++ b/src/dispnew.c | |||
| @@ -6143,7 +6143,7 @@ sit_for (sec, usec, reading, display, initial_display) | |||
| 6143 | return Qnil; | 6143 | return Qnil; |
| 6144 | 6144 | ||
| 6145 | if (initial_display) | 6145 | if (initial_display) |
| 6146 | redisplay_preserve_echo_area (); | 6146 | redisplay_preserve_echo_area (2); |
| 6147 | 6147 | ||
| 6148 | if (sec == 0 && usec == 0) | 6148 | if (sec == 0 && usec == 0) |
| 6149 | return Qt; | 6149 | return Qt; |
| @@ -2822,7 +2822,7 @@ is nil and `use-dialog-box' is non-nil.") | |||
| 2822 | && have_menus_p ()) | 2822 | && have_menus_p ()) |
| 2823 | { | 2823 | { |
| 2824 | Lisp_Object pane, menu; | 2824 | Lisp_Object pane, menu; |
| 2825 | redisplay_preserve_echo_area (); | 2825 | redisplay_preserve_echo_area (3); |
| 2826 | pane = Fcons (Fcons (build_string ("Yes"), Qt), | 2826 | pane = Fcons (Fcons (build_string ("Yes"), Qt), |
| 2827 | Fcons (Fcons (build_string ("No"), Qnil), | 2827 | Fcons (Fcons (build_string ("No"), Qnil), |
| 2828 | Qnil)); | 2828 | Qnil)); |
| @@ -2942,7 +2942,7 @@ is nil, and `use-dialog-box' is non-nil.") | |||
| 2942 | && have_menus_p ()) | 2942 | && have_menus_p ()) |
| 2943 | { | 2943 | { |
| 2944 | Lisp_Object pane, menu, obj; | 2944 | Lisp_Object pane, menu, obj; |
| 2945 | redisplay_preserve_echo_area (); | 2945 | redisplay_preserve_echo_area (4); |
| 2946 | pane = Fcons (Fcons (build_string ("Yes"), Qt), | 2946 | pane = Fcons (Fcons (build_string ("Yes"), Qt), |
| 2947 | Fcons (Fcons (build_string ("No"), Qnil), | 2947 | Fcons (Fcons (build_string ("No"), Qnil), |
| 2948 | Qnil)); | 2948 | Qnil)); |
diff --git a/src/keyboard.c b/src/keyboard.c index 62ca6789244..15c05e8f44e 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -2221,7 +2221,7 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu) | |||
| 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 | ||
| @@ -3039,7 +3039,7 @@ tracking_off (old_value) | |||
| 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 | } |
| @@ -3810,7 +3810,7 @@ swallow_events (do_display) | |||
| 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; |
| @@ -8919,8 +8919,8 @@ DEFUN ("read-key-sequence", Fread_key_sequence, Sread_key_sequence, 1, 5, 0, | |||
| 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 | { |
| @@ -9288,7 +9288,7 @@ detect_input_pending_run_timers (do_display) | |||
| 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 |
diff --git a/src/process.c b/src/process.c index 729dc43e429..2434851b7bc 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -2444,7 +2444,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display) | |||
| 2444 | if (timers_run != old_timers_run && do_display) | 2444 | if (timers_run != old_timers_run && do_display) |
| 2445 | /* We must retry, since a timer may have requeued itself | 2445 | /* We must retry, since a timer may have requeued itself |
| 2446 | and that could alter the time_delay. */ | 2446 | and that could alter the time_delay. */ |
| 2447 | redisplay_preserve_echo_area (); | 2447 | redisplay_preserve_echo_area (9); |
| 2448 | else | 2448 | else |
| 2449 | break; | 2449 | break; |
| 2450 | } | 2450 | } |
| @@ -2537,7 +2537,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display) | |||
| 2537 | #endif | 2537 | #endif |
| 2538 | } | 2538 | } |
| 2539 | if (total_nread > 0 && do_display) | 2539 | if (total_nread > 0 && do_display) |
| 2540 | redisplay_preserve_echo_area (); | 2540 | redisplay_preserve_echo_area (10); |
| 2541 | 2541 | ||
| 2542 | break; | 2542 | break; |
| 2543 | } | 2543 | } |
| @@ -2559,7 +2559,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display) | |||
| 2559 | if (frame_garbaged && do_display) | 2559 | if (frame_garbaged && do_display) |
| 2560 | { | 2560 | { |
| 2561 | clear_waiting_for_input (); | 2561 | clear_waiting_for_input (); |
| 2562 | redisplay_preserve_echo_area (); | 2562 | redisplay_preserve_echo_area (11); |
| 2563 | if (XINT (read_kbd) < 0) | 2563 | if (XINT (read_kbd) < 0) |
| 2564 | set_waiting_for_input (&timeout); | 2564 | set_waiting_for_input (&timeout); |
| 2565 | } | 2565 | } |
| @@ -2742,7 +2742,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display) | |||
| 2742 | FD_ZERO (&Available); | 2742 | FD_ZERO (&Available); |
| 2743 | 2743 | ||
| 2744 | if (do_display) | 2744 | if (do_display) |
| 2745 | redisplay_preserve_echo_area (); | 2745 | redisplay_preserve_echo_area (12); |
| 2746 | } | 2746 | } |
| 2747 | #ifdef EWOULDBLOCK | 2747 | #ifdef EWOULDBLOCK |
| 2748 | else if (nread == -1 && errno == EWOULDBLOCK) | 2748 | else if (nread == -1 && errno == EWOULDBLOCK) |
| @@ -4454,7 +4454,7 @@ status_notify () | |||
| 4454 | } /* end for */ | 4454 | } /* end for */ |
| 4455 | 4455 | ||
| 4456 | update_mode_lines++; /* in case buffers use %s in mode-line-format */ | 4456 | update_mode_lines++; /* in case buffers use %s in mode-line-format */ |
| 4457 | redisplay_preserve_echo_area (); | 4457 | redisplay_preserve_echo_area (13); |
| 4458 | 4458 | ||
| 4459 | UNGCPRO; | 4459 | UNGCPRO; |
| 4460 | } | 4460 | } |
| @@ -4794,7 +4794,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display) | |||
| 4794 | if (timers_run != old_timers_run && do_display) | 4794 | if (timers_run != old_timers_run && do_display) |
| 4795 | /* We must retry, since a timer may have requeued itself | 4795 | /* We must retry, since a timer may have requeued itself |
| 4796 | and that could alter the time delay. */ | 4796 | and that could alter the time delay. */ |
| 4797 | redisplay_preserve_echo_area (); | 4797 | redisplay_preserve_echo_area (14); |
| 4798 | else | 4798 | else |
| 4799 | break; | 4799 | break; |
| 4800 | } | 4800 | } |
| @@ -4834,7 +4834,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display) | |||
| 4834 | if (frame_garbaged && do_display) | 4834 | if (frame_garbaged && do_display) |
| 4835 | { | 4835 | { |
| 4836 | clear_waiting_for_input (); | 4836 | clear_waiting_for_input (); |
| 4837 | redisplay_preserve_echo_area (); | 4837 | redisplay_preserve_echo_area (15); |
| 4838 | if (XINT (read_kbd) < 0) | 4838 | if (XINT (read_kbd) < 0) |
| 4839 | set_waiting_for_input (&timeout); | 4839 | set_waiting_for_input (&timeout); |
| 4840 | } | 4840 | } |
diff --git a/src/sunfns.c b/src/sunfns.c index 2c94af082bd..065e2490828 100644 --- a/src/sunfns.c +++ b/src/sunfns.c | |||
| @@ -164,7 +164,7 @@ Redisplay does not happen if input is available before it starts.") | |||
| 164 | Timeout.tv_usec = (XINT(n) - (Timeout.tv_sec * 1000)) * 1000; | 164 | Timeout.tv_usec = (XINT(n) - (Timeout.tv_sec * 1000)) * 1000; |
| 165 | 165 | ||
| 166 | if (detect_input_pending()) return(Qnil); | 166 | if (detect_input_pending()) return(Qnil); |
| 167 | redisplay_preserve_echo_area (); | 167 | redisplay_preserve_echo_area (16); |
| 168 | /* | 168 | /* |
| 169 | * Check for queued keyboard input/mouse hits again | 169 | * Check for queued keyboard input/mouse hits again |
| 170 | * (A bit screen update can take some time!) | 170 | * (A bit screen update can take some time!) |
| @@ -197,7 +197,7 @@ DEFUN ("update-display", Fupdate_display, Supdate_display, 0, 0, 0, | |||
| 197 | "Perform redisplay.") | 197 | "Perform redisplay.") |
| 198 | () | 198 | () |
| 199 | { | 199 | { |
| 200 | redisplay_preserve_echo_area (); | 200 | redisplay_preserve_echo_area (17); |
| 201 | return(Qt); | 201 | return(Qt); |
| 202 | } | 202 | } |
| 203 | 203 | ||
diff --git a/src/sysdep.c b/src/sysdep.c index 339a3c2941a..e3a1821a8b3 100644 --- a/src/sysdep.c +++ b/src/sysdep.c | |||
| @@ -2033,7 +2033,7 @@ wait_for_kbd_input () | |||
| 2033 | { | 2033 | { |
| 2034 | update_mode_lines++; | 2034 | update_mode_lines++; |
| 2035 | prepare_menu_bars (); | 2035 | prepare_menu_bars (); |
| 2036 | redisplay_preserve_echo_area (); | 2036 | redisplay_preserve_echo_area (18); |
| 2037 | } | 2037 | } |
| 2038 | } | 2038 | } |
| 2039 | } | 2039 | } |
diff --git a/src/vmsproc.c b/src/vmsproc.c index 15e2c9d5e61..d97396071b0 100644 --- a/src/vmsproc.c +++ b/src/vmsproc.c | |||
| @@ -608,7 +608,7 @@ if you quit, the process is killed.") | |||
| 608 | InsCStr (vs->inputBuffer, vs->iosb[1]); | 608 | InsCStr (vs->inputBuffer, vs->iosb[1]); |
| 609 | } | 609 | } |
| 610 | if (!NILP (display) && INTERACTIVE) | 610 | if (!NILP (display) && INTERACTIVE) |
| 611 | redisplay_preserve_echo_area (); | 611 | redisplay_preserve_echo_area (19); |
| 612 | immediate_quit = 1; | 612 | immediate_quit = 1; |
| 613 | QUIT; | 613 | QUIT; |
| 614 | if (!start_vms_process_read (vs)) | 614 | if (!start_vms_process_read (vs)) |
diff --git a/src/xselect.c b/src/xselect.c index 08e4fd9b868..eae1b0cdb13 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -849,7 +849,7 @@ x_handle_selection_clear (event) | |||
| 849 | for (; CONSP (rest); rest = Fcdr (rest)) | 849 | for (; CONSP (rest); rest = Fcdr (rest)) |
| 850 | call1 (Fcar (rest), selection_symbol); | 850 | call1 (Fcar (rest), selection_symbol); |
| 851 | prepare_menu_bars (); | 851 | prepare_menu_bars (); |
| 852 | redisplay_preserve_echo_area (); | 852 | redisplay_preserve_echo_area (20); |
| 853 | } | 853 | } |
| 854 | } | 854 | } |
| 855 | } | 855 | } |
| @@ -886,7 +886,7 @@ x_clear_frame_selections (f) | |||
| 886 | #if 0 /* This can crash when deleting a frame | 886 | #if 0 /* This can crash when deleting a frame |
| 887 | from x_connection_closed. Anyway, it seems unnecessary; | 887 | from x_connection_closed. Anyway, it seems unnecessary; |
| 888 | something else should cause a redisplay. */ | 888 | something else should cause a redisplay. */ |
| 889 | redisplay_preserve_echo_area (); | 889 | redisplay_preserve_echo_area (21); |
| 890 | #endif | 890 | #endif |
| 891 | } | 891 | } |
| 892 | 892 | ||
| @@ -908,7 +908,7 @@ x_clear_frame_selections (f) | |||
| 908 | for (; CONSP (hooks); hooks = Fcdr (hooks)) | 908 | for (; CONSP (hooks); hooks = Fcdr (hooks)) |
| 909 | call1 (Fcar (hooks), selection_symbol); | 909 | call1 (Fcar (hooks), selection_symbol); |
| 910 | #if 0 /* See above */ | 910 | #if 0 /* See above */ |
| 911 | redisplay_preserve_echo_area (); | 911 | redisplay_preserve_echo_area (22); |
| 912 | #endif | 912 | #endif |
| 913 | } | 913 | } |
| 914 | XCDR (rest) = Fcdr (XCDR (rest)); | 914 | XCDR (rest) = Fcdr (XCDR (rest)); |