Call redisplay_preserve_echo_area with additional arg.

diff --git a/src/callproc.c b/src/callproc.c
index 9ba459f992ae5f9c28e6eac477c79ebbc89d5b20..59de2393586ed289754506e0eda6393fa3c5af69 100644 (file)
--- 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.")
            if (first)
              prepare_menu_bars ();
            first = 0;
-           redisplay_preserve_echo_area ();
+           redisplay_preserve_echo_area (1);
          }
        immediate_quit = 1;
        QUIT;

diff --git a/src/dispnew.c b/src/dispnew.c
index b4a1dabc6940f0d3ca194f5b11e8310d05d9823f..f9d9fb2d8566b186adf188875c435b11be30b0b6 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6143,7 +6143,7 @@ sit_for (sec, usec, reading, display, initial_display)
     return Qnil;
 
   if (initial_display)
-    redisplay_preserve_echo_area ();
+    redisplay_preserve_echo_area (2);
 
   if (sec == 0 && usec == 0)
     return Qt;

diff --git a/src/fns.c b/src/fns.c
index 8b31ef92a40210279374d817597f4af6532bc313..fd06513a0b434feb729c98a2de004df4dbc3561c 100644 (file)
--- a/src/fns.c
+++ b/src/fns.c
@@ -2822,7 +2822,7 @@ is nil and `use-dialog-box' is non-nil.")
          && have_menus_p ())
        {
          Lisp_Object pane, menu;
-         redisplay_preserve_echo_area ();
+         redisplay_preserve_echo_area (3);
          pane = Fcons (Fcons (build_string ("Yes"), Qt),
                        Fcons (Fcons (build_string ("No"), Qnil),
                               Qnil));
@@ -2942,7 +2942,7 @@ is nil, and `use-dialog-box' is non-nil.")
       && have_menus_p ())
     {
       Lisp_Object pane, menu, obj;
-      redisplay_preserve_echo_area ();
+      redisplay_preserve_echo_area (4);
       pane = Fcons (Fcons (build_string ("Yes"), Qt),
                    Fcons (Fcons (build_string ("No"), Qnil),
                           Qnil));

diff --git a/src/keyboard.c b/src/keyboard.c
index 62ca678924469a1c5876ee5ece39c63b1fa806df..15c05e8f44e9c324fbef9aeeb38b73178a816962 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2221,7 +2221,7 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
       while (!input_pending)
        {
          if (help_echo_showing_p && !EQ (selected_window, minibuf_window))
-           redisplay_preserve_echo_area ();
+           redisplay_preserve_echo_area (5);
          else
            redisplay ();
 
@@ -3039,7 +3039,7 @@ tracking_off (old_value)
         redisplay.  */
       if (!readable_events (1))
        {
-         redisplay_preserve_echo_area ();
+         redisplay_preserve_echo_area (6);
          get_input_pending (&input_pending, 1);
        }
     }
@@ -3810,7 +3810,7 @@ swallow_events (do_display)
   get_input_pending (&input_pending, 1);
 
   if (timers_run != old_timers_run && do_display)
-    redisplay_preserve_echo_area ();
+    redisplay_preserve_echo_area (7);
 }
 \f
 static EMACS_TIME timer_idleness_start_time;
@@ -8919,8 +8919,8 @@ DEFUN ("read-key-sequence", Fread_key_sequence, Sread_key_sequence, 1, 5, 0,
 DEFUN ("read-key-sequence-vector", Fread_key_sequence_vector,
        Sread_key_sequence_vector, 1, 5, 0,
   "Like `read-key-sequence' but always return a vector.")
-     /* Don't break the following line for documentation's sake.  */
-  (prompt, continue_echo, dont_downcase_last, can_return_switch_frame, command_loop)
+  (prompt, continue_echo, dont_downcase_last, can_return_switch_frame,
+   command_loop)
      Lisp_Object prompt, continue_echo, dont_downcase_last;
      Lisp_Object can_return_switch_frame, command_loop;
 {
@@ -9288,7 +9288,7 @@ detect_input_pending_run_timers (do_display)
 
   if (old_timers_run != timers_run && do_display)
     {
-      redisplay_preserve_echo_area ();
+      redisplay_preserve_echo_area (8);
       /* The following fixes a bug when using lazy-lock with
         lazy-lock-defer-on-the-fly set to t, i.e.  when fontifying
         from an idle timer function.  The symptom of the bug is that

diff --git a/src/process.c b/src/process.c
index 729dc43e42938d5c038b0587acaa29930494fbef..2434851b7bc77a70916f7bd728940504b27862af 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -2444,7 +2444,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
              if (timers_run != old_timers_run && do_display)
                /* We must retry, since a timer may have requeued itself
                   and that could alter the time_delay.  */
-               redisplay_preserve_echo_area ();
+               redisplay_preserve_echo_area (9);
              else
                break;
            }
@@ -2537,7 +2537,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
 #endif
            }
          if (total_nread > 0 && do_display)
-           redisplay_preserve_echo_area ();
+           redisplay_preserve_echo_area (10);
 
          break;
        }
@@ -2559,7 +2559,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
       if (frame_garbaged && do_display)
        {
          clear_waiting_for_input ();
-         redisplay_preserve_echo_area ();
+         redisplay_preserve_echo_area (11);
          if (XINT (read_kbd) < 0)
            set_waiting_for_input (&timeout);
        }
@@ -2742,7 +2742,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
                  FD_ZERO (&Available);
 
                  if (do_display)
-                   redisplay_preserve_echo_area ();
+                   redisplay_preserve_echo_area (12);
                }
 #ifdef EWOULDBLOCK
              else if (nread == -1 && errno == EWOULDBLOCK)
@@ -4454,7 +4454,7 @@ status_notify ()
     } /* end for */
 
   update_mode_lines++;  /* in case buffers use %s in mode-line-format */
-  redisplay_preserve_echo_area ();
+  redisplay_preserve_echo_area (13);
 
   UNGCPRO;
 }
@@ -4794,7 +4794,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
              if (timers_run != old_timers_run && do_display)
                /* We must retry, since a timer may have requeued itself
                   and that could alter the time delay.  */
-               redisplay_preserve_echo_area ();
+               redisplay_preserve_echo_area (14);
              else
                break;
            }
@@ -4834,7 +4834,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
       if (frame_garbaged && do_display)
        {
          clear_waiting_for_input ();
-         redisplay_preserve_echo_area ();
+         redisplay_preserve_echo_area (15);
          if (XINT (read_kbd) < 0)
            set_waiting_for_input (&timeout);
        }

diff --git a/src/sunfns.c b/src/sunfns.c
index 2c94af082bdaa193b75ab71e549f07ae0eb6cea1..065e2490828fa1d54f006578c308f7ba04a062a6 100644 (file)
--- a/src/sunfns.c
+++ b/src/sunfns.c
@@ -164,7 +164,7 @@ Redisplay does not happen if input is available before it starts.")
   Timeout.tv_usec = (XINT(n) - (Timeout.tv_sec * 1000)) * 1000;
 
   if (detect_input_pending()) return(Qnil);
-  redisplay_preserve_echo_area ();
+  redisplay_preserve_echo_area (16);
   /*
    *   Check for queued keyboard input/mouse hits again
    *   (A bit screen update can take some time!)
@@ -197,7 +197,7 @@ DEFUN ("update-display", Fupdate_display, Supdate_display, 0, 0, 0,
        "Perform redisplay.")
      ()
 {
-  redisplay_preserve_echo_area ();
+  redisplay_preserve_echo_area (17);
   return(Qt);
 }
 

diff --git a/src/sysdep.c b/src/sysdep.c
index 339a3c2941a1e77d2401a7bb1e839f5700f9949c..e3a1821a8b3fb37c2a922f2ca751539c655a43c5 100644 (file)
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -2033,7 +2033,7 @@ wait_for_kbd_input ()
            {
              update_mode_lines++;
              prepare_menu_bars ();
-             redisplay_preserve_echo_area ();
+             redisplay_preserve_echo_area (18);
            }
        }
     }

diff --git a/src/vmsproc.c b/src/vmsproc.c
index 15e2c9d5e61e762602098fc94cdcce9a15080a1a..d97396071b004a533746dfaa1b24b98e0932a3bd 100644 (file)
--- a/src/vmsproc.c
+++ b/src/vmsproc.c
@@ -608,7 +608,7 @@ if you quit, the process is killed.")
              InsCStr (vs->inputBuffer, vs->iosb[1]);
            }
          if (!NILP (display) && INTERACTIVE)
-         redisplay_preserve_echo_area ();
+         redisplay_preserve_echo_area (19);
          immediate_quit = 1;
          QUIT;
          if (!start_vms_process_read (vs))

diff --git a/src/xselect.c b/src/xselect.c
index 08e4fd9b8688912b9c9af80a5a105ced6603b4ae..eae1b0cdb13f5e6f6968f149ec091373e5a5679a 100644 (file)
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -849,7 +849,7 @@ x_handle_selection_clear (event)
        for (; CONSP (rest); rest = Fcdr (rest))
          call1 (Fcar (rest), selection_symbol);
        prepare_menu_bars ();
-       redisplay_preserve_echo_area ();
+       redisplay_preserve_echo_area (20);
       }
   }
 }
@@ -886,7 +886,7 @@ x_clear_frame_selections (f)
 #if 0 /* This can crash when deleting a frame
         from x_connection_closed.  Anyway, it seems unnecessary;
         something else should cause a redisplay.  */
-         redisplay_preserve_echo_area ();
+         redisplay_preserve_echo_area (21);
 #endif
        }
 
@@ -908,7 +908,7 @@ x_clear_frame_selections (f)
            for (; CONSP (hooks); hooks = Fcdr (hooks))
              call1 (Fcar (hooks), selection_symbol);
 #if 0 /* See above */
-           redisplay_preserve_echo_area ();
+           redisplay_preserve_echo_area (22);
 #endif
          }
        XCDR (rest) = Fcdr (XCDR (rest));