diff src/xfns.c @ 83298:ed09a89e2b25

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
author Karoly Lorentey <lorentey@elte.hu>
date Tue, 03 May 2005 01:49:33 +0000
parents b00208784797
children 5ae8a8b0a308
line wrap: on
line diff
--- a/src/xfns.c	Tue May 03 01:38:40 2005 +0000
+++ b/src/xfns.c	Tue May 03 01:49:33 2005 +0000
@@ -263,10 +263,8 @@
     }
   else if (INTEGERP (frame))
     {
-      struct display *d = get_display (XINT (frame));
-
-      if (!d)
-        wrong_type_argument (Qdisplay_live_p, frame);
+      struct display *d = get_display (XINT (frame), 1);
+
       if (d->type != output_x_window)
         error ("Display %d is not an X display", XINT (frame));