Mercurial > emacs

changeset 35336:002c02db42d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Call redisplay_preserve_echo_area with additional arg.
author Gerd Moellmann <gerd@gnu.org>
date Tue, 16 Jan 2001 12:42:22 +0000
parents b5a39d371511
children d3d87c5d1158
files src/callproc.c src/dispnew.c src/fns.c src/keyboard.c src/process.c src/sunfns.c src/sysdep.c src/vmsproc.c src/xselect.c
diffstat 9 files changed, 24 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/src/callproc.c	Tue Jan 16 12:38:28 2001 +0000
+++ b/src/callproc.c	Tue Jan 16 12:42:22 2001 +0000
@@ -836,7 +836,7 @@
 	    if (first)
 	      prepare_menu_bars ();
 	    first = 0;
-	    redisplay_preserve_echo_area ();
+	    redisplay_preserve_echo_area (1);
 	  }
 	immediate_quit = 1;
 	QUIT;
--- a/src/dispnew.c	Tue Jan 16 12:38:28 2001 +0000
+++ b/src/dispnew.c	Tue Jan 16 12:42:22 2001 +0000
@@ -6143,7 +6143,7 @@
     return Qnil;
 
   if (initial_display)
-    redisplay_preserve_echo_area ();
+    redisplay_preserve_echo_area (2);
 
   if (sec == 0 && usec == 0)
     return Qt;
--- a/src/fns.c	Tue Jan 16 12:38:28 2001 +0000
+++ b/src/fns.c	Tue Jan 16 12:42:22 2001 +0000
@@ -2822,7 +2822,7 @@
 	  && 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 @@
       && 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));
--- a/src/keyboard.c	Tue Jan 16 12:38:28 2001 +0000
+++ b/src/keyboard.c	Tue Jan 16 12:42:22 2001 +0000
@@ -2221,7 +2221,7 @@
       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 @@
 	 redisplay.  */
       if (!readable_events (1))
 	{
-	  redisplay_preserve_echo_area ();
+	  redisplay_preserve_echo_area (6);
 	  get_input_pending (&input_pending, 1);
 	}
     }
@@ -3810,7 +3810,7 @@
   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-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 @@
 
   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
--- a/src/process.c	Tue Jan 16 12:38:28 2001 +0000
+++ b/src/process.c	Tue Jan 16 12:42:22 2001 +0000
@@ -2444,7 +2444,7 @@
 	      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 @@
 #endif
 	    }
 	  if (total_nread > 0 && do_display)
-	    redisplay_preserve_echo_area ();
+	    redisplay_preserve_echo_area (10);
 
 	  break;
 	}
@@ -2559,7 +2559,7 @@
       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 @@
 		  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 @@
     } /* 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 @@
 	      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 @@
       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);
 	}
--- a/src/sunfns.c	Tue Jan 16 12:38:28 2001 +0000
+++ b/src/sunfns.c	Tue Jan 16 12:42:22 2001 +0000
@@ -164,7 +164,7 @@
   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 @@
        "Perform redisplay.")
      ()
 {
-  redisplay_preserve_echo_area ();
+  redisplay_preserve_echo_area (17);
   return(Qt);
 }
 
--- a/src/sysdep.c	Tue Jan 16 12:38:28 2001 +0000
+++ b/src/sysdep.c	Tue Jan 16 12:42:22 2001 +0000
@@ -2033,7 +2033,7 @@
 	    {
 	      update_mode_lines++;
 	      prepare_menu_bars ();
-	      redisplay_preserve_echo_area ();
+	      redisplay_preserve_echo_area (18);
 	    }
 	}
     }
--- a/src/vmsproc.c	Tue Jan 16 12:38:28 2001 +0000
+++ b/src/vmsproc.c	Tue Jan 16 12:42:22 2001 +0000
@@ -608,7 +608,7 @@
 	      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))
--- a/src/xselect.c	Tue Jan 16 12:38:28 2001 +0000
+++ b/src/xselect.c	Tue Jan 16 12:42:22 2001 +0000
@@ -849,7 +849,7 @@
 	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 @@
 #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 @@
 	    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));