Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-290
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-161

1 files changed, 14 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 673ebc5a1ed..5168e9126e1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,19 @@
+2004-05-08  Peter Whaite  <emacs@whaite.ca>  (tiny change)
+
+        * data.c (Fquo): If any argument is float, do the computation in
+        floating point.
+
 2004-05-08  Juanma Barranquero  <lektu@terra.es>
 
+        * process.c (Fwaiting_for_user_input_p, Fmake_network_process)
+        (Fset_process_query_on_exit_flag, Vprocess_adaptive_read_buffering):
+        Fix spelling of Emacs on docstring.
+        (Fset_process_coding_system, Fprocess_coding_system)
+        (Fset_process_filter_multibyte, Fprocess_filter_multibyte_p):
+        Make argument names match their use in docstring.
+        (Fprocess_id, Fprocess_query_on_exit_flag, Finterrupt_process):
+        Fix docstring.
+
         * editfns.c (Finsert_buffer_substring): Make argument names match their
         use in docstring.