From: Kim F. Storm <storm@cua.dk>
Date: Wed, 22 Mar 2006 22:46:57 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~3463
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ea049c5e0a79e9a475e9ba0ab32571ea2184ec32;p=emacs.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index bfa3a0293b8..2bb8e9120c3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2006-03-22  Kim F. Storm  <storm@cua.dk>
 
+	* 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