Merged in changes from CVS trunk.

[gnu-emacs] / src / cm.h

diff --git a/src/cm.h b/src/cm.h
index e71859c1a64ce2812bf3b15d3386e63ef9e58f55..1b6c9522bbe2e4f6a116f8ed57790a922523f302 100644 (file)
--- a/src/cm.h
+++ b/src/cm.h
@@ -163,13 +163,13 @@ extern int evalcost ();
 
 #define emacs_tputs(tty, str, affcnt, putc) (current_tty = (tty), tputs (str, affcnt, putc))
 
-extern struct tty_output *current_tty;
-extern void cmcheckmagic P_ ((struct tty_output *));
+extern struct tty_display_info *current_tty;
+extern void cmcheckmagic P_ ((struct tty_display_info *));
 extern int cmputc P_ ((int));
-extern void cmcostinit P_ ((struct tty_output *));
-extern void cmgoto P_ ((struct tty_output *, int, int));
-extern void Wcm_clear P_ ((struct tty_output *));
-extern int Wcm_init P_ ((struct tty_output *));
+extern void cmcostinit P_ ((struct tty_display_info *));
+extern void cmgoto P_ ((struct tty_display_info *, int, int));
+extern void Wcm_clear P_ ((struct tty_display_info *));
+extern int Wcm_init P_ ((struct tty_display_info *));
 
 /* arch-tag: acc1535a-7136-49d6-b22d-9bc85702251b
    (do not change this comment) */