From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 23 Jul 2005 19:09:50 +0000 (+0000)
Subject: (read_char): Test gc_cons_threshold.
X-Git-Tag: emacs-pretest-22.0.90~7894
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c8e16a028e3c3cf1902a1cfe18fc9d5d4a65086b;p=emacs.git

(read_char): Test gc_cons_threshold.
(syms_of_keyboard): staticpro Qecho_area_clear_hook.
---

diff --git a/src/keyboard.c b/src/keyboard.c
index b854d423cd1..194e52d2700 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2778,7 +2778,7 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
 		 available, garbage collect if there has been enough
 		 consing going on to make it worthwhile.  */
 	      if (!detect_input_pending_run_timers (0)
-		  && consing_since_gc > gc_cons_combined_threshold / 2)
+		  && consing_since_gc > gc_cons_threshold / 2)
 		Fgarbage_collect ();
 
 	      redisplay ();
@@ -11282,6 +11282,7 @@ might happen repeatedly and make Emacs nonfunctional.  */);
 	       doc: /* Normal hook run when clearing the echo area.  */);
 #endif
   Qecho_area_clear_hook = intern ("echo-area-clear-hook");
+  staticpro (&Qecho_area_clear_hook);
   SET_SYMBOL_VALUE (Qecho_area_clear_hook, Qnil);
 
   DEFVAR_LISP ("lucid-menu-bar-dirty-flag", &Vlucid_menu_bar_dirty_flag,