Merged in changes from CVS HEAD

Patches applied:

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

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

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

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

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


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

1 files changed, 23 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a25239d88a3..1a2f7f4e20b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,26 @@
+2004-02-23  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * abbrev.c (Finsert_abbrev_table_description): Doc fix.
+
+2004-02-22  Jason Rumney  <jasonr@gnu.org>
+
+        * w32term.c (w32_draw_fringe_bitmap): Draw overlaid bitmaps
+        correctly over other bitmaps.
+
+2004-02-21  Eli Zaretskii  <eliz@elta.co.il>
+
+        * emacs.c (USAGE1): Split into two halves.
+        (USAGE2): Second half of the old USAGE1.
+        (USAGE3): Renamed from USAGE2.
+        (USAGE4): Renamed from USAGE3.
+
+2004-02-21  Juri Linkov  <juri@jurta.org>
+
+        * emacs.c (USAGE1): Add --no-desktop.  Move --display from USAGE2.
+        Fix --multibyte.  Move --help, --version to USAGE2.  Add alias
+        --file.  Fix -f, -l.  Sort options.  Untabify.
+        (USAGE2): Add -hb.  Fix --name, --title.  Sort options.  Untabify.
+
 2004-02-19  Luc Teirlinck  <teirllm@auburn.edu>
 
         * category.c (Fdefine_category, Fcategory_docstring)