Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-49

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 164-184)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: man/mh-e.texi (Folders): Various edits.
   - Update from erc--emacs--0

 * gnus--rel--5.10  (patch 62-70)

   - Merge from emacs--devo--0
   - Update from CVS

1 files changed, 6 insertions, 0 deletions

diff --git a/src/term.c b/src/term.c
index 9f360b70baf..48942a46671 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1654,6 +1654,12 @@ term_get_fkeys_1 ()
                        Character Display Information
  ***********************************************************************/
 
+/* Avoid name clash with functions defined in xterm.c */
+#ifdef static
+#define append_glyph append_glyph_term
+#define produce_stretch_glyph produce_stretch_glyph_term
+#endif
+
 static void append_glyph P_ ((struct it *));
 static void produce_stretch_glyph P_ ((struct it *));