summaryrefslogtreecommitdiff
path: root/src/dispextern.h
diff options
context:
space:
mode:
authorKaroly Lorentey <lorentey@elte.hu>2006-04-20 16:09:11 +0000
committerKaroly Lorentey <lorentey@elte.hu>2006-04-20 16:09:11 +0000
commit7007c96249c3495638b1456cab67d8a97c991b1c (patch)
tree92813fd8b1b1618c84aa578fb29f6b985eabe3e2 /src/dispextern.h
parentc9ab9c086a89af0f9288d686040def68acb206fa (diff)
downloademacs-7007c96249c3495638b1456cab67d8a97c991b1c.tar.gz
Make `tty-display-color-p' follow its doc string. (Reported by Dan Nicolaescu.)
* lisp/vc.el (vc-annotate-color-map): Undo previous change. * src/dispnew.c (Fsend_string_to_terminal): Update call to `get_tty_terminal'. * src/term.c (Fsuspend_tty, Fresume_tty): Update call to `get_tty_terminal'. (get_tty_terminal): Add throw parameter. (Ftty_display_color_p, Ftty_display_color_cells): Don't throw errors on X frames. * src/dispextern.h (get_tty_terminal): Update prototype. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-552
Diffstat (limited to 'src/dispextern.h')
-rw-r--r--src/dispextern.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dispextern.h b/src/dispextern.h
index 157f49dea6d..137b1d4dee2 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2957,7 +2957,7 @@ extern void produce_glyphs P_ ((struct it *));
extern void produce_special_glyphs P_ ((struct it *, enum display_element_type));
extern int tty_capable_p P_ ((struct tty_display_info *, unsigned, unsigned long, unsigned long));
extern void set_tty_color_mode P_ ((struct frame *, Lisp_Object));
-extern struct terminal *get_tty_terminal P_ ((Lisp_Object terminal));
+extern struct terminal *get_tty_terminal P_ ((Lisp_Object, int));
extern struct terminal *get_named_tty P_ ((char *));
EXFUN (Ftty_type, 1);
extern void create_tty_output P_ ((struct frame *));