# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1102967196 0
# Node ID 9b6234081dc1cfac8ac3d153f07b8af997748f10
# Parent  2cce3ac9ec7b5c5576647c737e7e2e4a53859a25
*** empty log message ***

diff -r 2cce3ac9ec7b -r 9b6234081dc1 etc/NEWS
--- a/etc/NEWS	Mon Dec 13 19:45:07 2004 +0000
+++ b/etc/NEWS	Mon Dec 13 19:46:36 2004 +0000
@@ -2371,6 +2371,11 @@
 
 * Lisp Changes in Emacs 21.4
 
+** (while-no-input BODY...) runs BODY, but only so lomg as no input
+arrives.  If the user types or clicks anything, BODY stops as if a
+quit had occurred.  while-no-input returns the value of BODY, if BODY
+finishes.  It returns nil if BODY was aborted.
+
 ---
 ** To manipulate the File menu using easy-menu, you must specify the
 proper name "file".  In previous Emacs versions, you had to specify
@@ -2620,8 +2625,10 @@
 around potentially blocking or long-running code in timers
 and post-command-hooks.
 
-** An unconditional face specification in defface (one where the DISPLAY part
-is just t) applies to all cases and does not override subsequent entries.
+** The first face specification element in a defface can specify
+`default' instead of frame classification.  Then its attributes act as
+defaults that apply to all the subsequent cases (and may be overridden
+by them).
 
 +++
 ** New face attribute `min-colors' can be used to tailor the face color
diff -r 2cce3ac9ec7b -r 9b6234081dc1 etc/TODO
--- a/etc/TODO	Mon Dec 13 19:45:07 2004 +0000
+++ b/etc/TODO	Mon Dec 13 19:46:36 2004 +0000
@@ -15,6 +15,9 @@
   ought to be possible to omit text which is invisible (due to a
   text-property, overlay, or selective display) from the kill-ring.
 
+** Redefine define-generic-mode as a macro, so the compiler
+  sees the definitions it generates.
+
 * Important features:
 
 ** Provide user-friendly ways to list all available font families,
diff -r 2cce3ac9ec7b -r 9b6234081dc1 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Dec 13 19:45:07 2004 +0000
+++ b/lisp/ChangeLog	Mon Dec 13 19:46:36 2004 +0000
@@ -12,9 +12,6 @@
 
 	* xml.el (xml-name-re, xml-entity-value-re): Add defvars.
 
-	* vc.el (vc-default-update-changelog): Use insert-file-contents,
-	not insert-file.
-
 	* emacs-lisp/elint.el (elint-standard-variables)
 	(elint-unknown-builtin-args): Move definitions up.
 
diff -r 2cce3ac9ec7b -r 9b6234081dc1 src/ChangeLog
--- a/src/ChangeLog	Mon Dec 13 19:45:07 2004 +0000
+++ b/src/ChangeLog	Mon Dec 13 19:46:36 2004 +0000
@@ -1,3 +1,14 @@
+2004-12-13  Richard M. Stallman  <rms@gnu.org>
+
+	* eval.c (syms_of_eval) <quit-flag>: Doc fix.
+
+	* keyboard.c (Vthrow_on_input): New variable.
+	(syms_of_keyboard): Defvar and initialize it.
+	(kbd_buffer_store_event_hold): Handle Vthrow_on_input.
+
+	* lisp.h (QUIT): Check for Vthrow_on_input.
+	(Vthrow_on_input): Declare it.
+
 2004-12-13  Kim F. Storm  <storm@cua.dk>
 
 	* xdisp.c (set_iterator_to_next): Reset stop_charpos after display