aboutsummaryrefslogtreecommitdiffstats
path: root/src/dispextern.h
diff options
context:
space:
mode:
authorKaroly Lorentey2005-05-03 01:49:33 +0000
committerKaroly Lorentey2005-05-03 01:49:33 +0000
commit68bba4e4b3ced56b5608ee0495f94d24e7e3f40c (patch)
tree43067ff161298f52824bd833e6d16b65dddf23e9 /src/dispextern.h
parent941d4811d5b6660e2cdb5f668d52792c7e5920e8 (diff)
downloademacs-68bba4e4b3ced56b5608ee0495f94d24e7e3f40c.tar.gz
emacs-68bba4e4b3ced56b5608ee0495f94d24e7e3f40c.zip
Fix UTF-8 tty input when first frame is an X frame. Steps towards multiple tty locale support.
* lisp/international/mule-cmds.el (set-locale-environment): Ignore window-system; always set the keyboard coding system. * src/termhooks.h (DISPLAY_TERMINAL_CODING, DISPLAY_KEYBOARD_CODING): New macros. * src/coding.c (Fset_terminal_coding_system_internal, Fterminal_coding_system) (Fset_keyboard_coding_system_internal, Fkeyboard_coding_system): Add DISPLAY parameter. * src/term.c (get_display): Add THROW parameter. (get_tty_display, Fdisplay_name, Fdisplay_tty_type, Fdisplay_controlling_tty_p) (Fdelete_display, Fdisplay_live_p): Update callers. * src/xfns.c (check_x_display_info): Ditto. * src/frame.c (Fmake_terminal_frame, Fframe_display): Ditto. * src/dispextern.h (get_display): Update prototype. * lisp/international/mule.el (set-terminal-coding-system) (set-keyboard-coding-system): Add DISPLAY parameter. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-338
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 abcda4fc731..df6bbd00eec 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2925,7 +2925,7 @@ extern int per_line_cost P_ ((char *));
2925extern void calculate_costs P_ ((struct frame *)); 2925extern void calculate_costs P_ ((struct frame *));
2926extern void set_tty_color_mode P_ ((struct frame *, Lisp_Object)); 2926extern void set_tty_color_mode P_ ((struct frame *, Lisp_Object));
2927extern void tty_setup_colors P_ ((struct tty_display_info *, int)); 2927extern void tty_setup_colors P_ ((struct tty_display_info *, int));
2928extern struct display *get_display P_ ((Lisp_Object display)); 2928extern struct display *get_display P_ ((Lisp_Object display, int));
2929extern struct display *get_named_tty_display P_ ((char *)); 2929extern struct display *get_named_tty_display P_ ((char *));
2930EXFUN (Fdisplay_tty_type, 1); 2930EXFUN (Fdisplay_tty_type, 1);
2931extern struct display *init_initial_display P_ ((void)); 2931extern struct display *init_initial_display P_ ((void));