Call redisplay_preserve_echo_area with additional arg.

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;

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;

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));

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);
 }
 
 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

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);
 	}

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);
 }
 

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);
 	    }
 	}
     }

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))

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));