Merged in changes from CVS trunk.

Patches applied:

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-640
   Merge from gnus--rel--5.10

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-650
   Merge from gnus--rel--5.10

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

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

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-59
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-60
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-61
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-62
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-63
   Update from CVS


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

1 files changed, 6 insertions, 6 deletions

diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index 91fcdd1c899..a9465058194 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -6,25 +6,25 @@
 
 1999-12-31  William M. Perry  <wmperry@aventail.com>
 
-        * xfns.c (jpeg_format): Added the :data keyword
+        * xfns.c (jpeg_format): Add the :data keyword
         (jpeg_image_p): JPEG is valid with :file _or_ :data
-        (jpeg_memory_src): Defined new JPEG image source to read from a
+        (jpeg_memory_src): Define new JPEG image source to read from a
         memory buffer.
         (jpeg_load): Pay attention to the :data keyword if specified.
         Instantiates a jpeg_memory_src instead of jpeg_stdio_src if found.
-        (png_format): Added the :data keyword
+        (png_format): Add the :data keyword
         (png_image_p): PNG is valid with :file _or_ :data
         (png_read_from_memory): New PNG read function to read from a
         memory buffer.
         (png_load): Pay attention to the :data keyword if specified.
         Use png_set_read_fn() instead of png_init_io() if specified.
-        (tiff_format): Added the :data keyword for TIFF images.
+        (tiff_format): Add the :data keyword for TIFF images.
         (tiff_image_p): TIFF is valid with :file _or_ :data
-        (tiff_read_from_memory): Defined new TIFF I/O functions to read
+        (tiff_read_from_memory): Define new TIFF I/O functions to read
         from a memory buffer.
         (tiff_load): Pay attention to the :data keyword if specified.
         Uses TIFFClientOpen() instead of TIFFOpen() if specified.
-        (gif_format): Added the :data keyword
+        (gif_format): Add the :data keyword
         (gif_image_p): GIF is valid with :file _or_ :data
         (gif_read_from_memory): New GIF input function to read from a
         memory buffer.