Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

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


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

1 files changed, 14 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 28030aef0e3..38a079989be 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2004-12-08  Richard M. Stallman  <rms@gnu.org>
+
+        * xdisp.c (get_next_display_element): Use `escape-glyph' for
+        control chars and escaped octal codes.
+        (Qescape_glyph): New variable.
+        (syms_of_xdisp): Initialize it.
+        (escape_glyph_face): New variable.
+        (redisplay_window): Initialize it.
+
+2004-12-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * image.c (our_fill_input_buffer, jpeg_load, CHECK_LIB_AVAILABLE)
+        (init_image): Use 1 rather than TRUE.  TRUE's not always defined.
+
 2004-12-07  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * emacs.c (Fdump_emacs): Add ! defined (SYSTEM_MALLOC) around