diff options
| author | Karoly Lorentey <[email protected]> | 2005-05-03 01:49:33 +0000 |
|---|---|---|
| committer | Karoly Lorentey <[email protected]> | 2005-05-03 01:49:33 +0000 |
| commit | 68bba4e4b3ced56b5608ee0495f94d24e7e3f40c (patch) | |
| tree | 43067ff161298f52824bd833e6d16b65dddf23e9 /src/termhooks.h | |
| parent | 941d4811d5b6660e2cdb5f668d52792c7e5920e8 (diff) | |
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: [email protected]/emacs--multi-tty--0--patch-338
Diffstat (limited to 'src/termhooks.h')
| -rw-r--r-- | src/termhooks.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/termhooks.h b/src/termhooks.h index d424ad75e4..788b57e9d1 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -550,6 +550,9 @@ extern struct display *display_list; #define FRAME_TERMINAL_CODING(f) ((f)->display->terminal_coding) #define FRAME_KEYBOARD_CODING(f) ((f)->display->keyboard_coding) +#define DISPLAY_TERMINAL_CODING(d) ((d)->terminal_coding) +#define DISPLAY_KEYBOARD_CODING(d) ((d)->keyboard_coding) + #define FRAME_RIF(f) ((f)->display->rif) #define FRAME_DISPLAY(f) ((f)->display) |