1 files changed, 27 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 744259568e4..58661af0867 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,26 @@
+2004-02-20  Kim F. Storm  <storm@cua.dk>
+
+        * keyboard.c: Undo 2004-02-16 and 2004-02-17 changes.
+        The following changes are relative to the 2004-01-21 revision.
+        (NREAD_INPUT_EVENTS): Define as max number of input events to read
+        in one call to read_socket_hook.  Value is 8.
+        (read_avail_input): Separate and rework handling of read_socket_hook
+        and non-read_socket_hook cases.  Use smaller input_event buffer
+        in read_socket_hook case, and repeat if full buffer is read.  Use
+        new local variable 'discard' to skip input after C-g. 
+        In non-read_socket_hook case, just use a single input_event, and
+        call kbd_buffer_store_event on the fly for each character.
+
+2004-02-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lisp.h (union Lisp_Object): Give a more precise type for `type'.
+        Remove unused `gu' alternative.
+
+2004-02-19  Andreas Schwab  <schwab@suse.de>
+
+        * fringe.c (Fdefine_fringe_bitmap): Use && instead of & to avoid
+        warning.
+
 2004-02-18  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (get_window_cursor_type, display_and_set_cursor):
@@ -44,9 +67,9 @@
 
 2004-02-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-        * data.c (Fbyteorder): 
-        * fringe.c (Fdefine_fringe_bitmap): 
-        * xdisp.c (handle_single_display_prop): 
+        * data.c (Fbyteorder):
+        * fringe.c (Fdefine_fringe_bitmap):
+        * xdisp.c (handle_single_display_prop):
         * xselect.c (x_handle_dnd_message): Lisp_Object/int mixup.
 
 2004-02-16  Jason Rumney  <jasonr@gnu.org>
@@ -59,7 +82,7 @@
         controlling emulation of a three button mouse with option and
         command keys.
         (Qreverse, mac_get_enumlated_btn): Handle the emulation
-        (mac_event_to_emacs_modifiers, XTread_socket): Ditto
+        (mac_event_to_emacs_modifiers, XTread_socket): Ditto.
 
 2004-02-15  Kim F. Storm  <storm@cua.dk>