diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 47cf7a9ba85..e4858eb532b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-08  Richard M. Stallman  <rms@gnu.org>
+
+	* faces.el: Delete code to set display table.
+	(escape-glyph): Redefine to be less loud.  (Copy minibuffer-prompt.)
+
 2004-12-08  Jay Belanger  <belanger@truman.edu>
 
 	* calc/calc.el: Add math-read-preprocess-string to autoloads.
diff --git a/src/ChangeLog b/src/ChangeLog
index 39401c9453c..38a079989be 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+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)