[Emacs-diffs] Changes to emacs/src/ChangeLog

[Kim F. Storm]

Index: emacs/src/ChangeLog
diff -u emacs/src/ChangeLog:1.4966 emacs/src/ChangeLog:1.4967
--- emacs/src/ChangeLog:1.4966  Wed Mar 22 22:30:32 2006
+++ emacs/src/ChangeLog Wed Mar 22 22:46:57 2006
@@ -1,5 +1,10 @@
 2006-03-22  Kim F. Storm  <address@hidden>
 
+       * xdisp.c: Undo 2006-03-21 change.
+
+       * term.c: Define aliases for append_glyph and produce_stretch_glyph
+       when `static' is defined to avoid name clash with those in xdisp.c.
+
        * process.c (Faccept_process_output): Fix to comply with lisp reference.
        Change arg "timeout" to "seconds" and allow both integer and float 
value.
        Change arg "timeout-msec" to "millisec" and interpret" as milliseconds