Mercurial > emacs
diff src/coding.c @ 83342:9216636c02fc
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly.
* src/termhooks.h (struct device): Rename to `struct device'.
Rename member `next_display' to `next_device'.
Rename member `delete_display_hook' to `delete_device_hook'.
(FRAME_DISPLAY): Rename to FRAME_DEVICE.
(DISPLAY_ACTIVE_P): Rename to DEVICE_ACTIVE_P.
(DISPLAY_TERMINAL_CODING): Rename to DEVICE_TERMINAL_CODING.
(DISPLAY_KEYBOARD_CODING): Rename to DEVICE_KEYBOARD_CODING.
* src/frame.h (stuct frame): Rename `display' member to `device'.
* src/xterm.h (x_display_info): Rename member `frame_display' to `device'.
* src/termchar.h (struct tty_display_info): Rename `display' member to `device'.
* src/keyboard.c (push_display_kboard): Rename to push_device_kboard.
* lisp/frame.el (make-frame): Rename frame parameter `display-id' to `device'.
* src/frame.c (Fmake_terminal_frame): Ditto.
* src/xfns.c (Fx_create_frame): Ditto.
* src/term.c (display_list): Rename to device_list.
* src/term.c (initial_display): Rename to initial_device.
* src/term.c (next_display_id): Rename to next_device_id.
* src/term.c (get_display): Rename to get_device.
* src/term.c (get_tty_display): Rename to get_tty_device.
* src/term.c (get_named_tty_display): Rename to get_named_tty.
* src/term.c (init_initial_display): Rename to init_initial_device.
* src/term.c (delete_initial_display): Rename to delete_initial_device.
* src/term.c (create_display): Rename to create_device.
* src/term.c (delete_display): Rename to delete_device.
* src/xfns.c (check_x_display_info): Document that the function allows
display ids as well.
* src/xterm.c (x_delete_frame_display): Rename to x_delete_device.
* src/xterm.c (x_create_frame_display): Rename to x_create_device.
* src/coding.c: Update.
* src/dispextern.h: Update.
* src/data.c: Update.
* src/dispnew.c: Update.
* src/frame.c: Update.
* src/frame.h: Update.
* src/keyboard.c: Update.
* src/keyboard.h: Update.
* src/lisp.h: Update.
* src/sysdep.c: Update.
* src/term.c: Update.
* src/xdisp.c: Update.
* src/xselect.c: Update.
* src/xterm.c: Update.
* src/prefix-args.c: Include stdlib.h for exit.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-382
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Mon, 11 Jul 2005 00:05:55 +0000 |
parents | 6c13700d1c13 |
children | 532e0a9335a9 |
line wrap: on
line diff
--- a/src/coding.c Sun Jul 10 22:25:28 2005 +0000 +++ b/src/coding.c Mon Jul 11 00:05:55 2005 +0000 @@ -7307,11 +7307,11 @@ DEFUN ("set-terminal-coding-system-internal", Fset_terminal_coding_system_internal, Sset_terminal_coding_system_internal, 1, 2, 0, doc: /* Internal use only. */) - (coding_system, display) + (coding_system, device) Lisp_Object coding_system; - Lisp_Object display; + Lisp_Object device; { - struct coding_system *terminal_coding = DISPLAY_TERMINAL_CODING (get_display (display, 1)); + struct coding_system *terminal_coding = DEVICE_TERMINAL_CODING (get_device (device, 1)); CHECK_SYMBOL (coding_system); setup_coding_system (Fcheck_coding_system (coding_system), terminal_coding); /* We had better not send unsafe characters to terminal. */ @@ -7345,38 +7345,39 @@ DEFUN ("terminal-coding-system", Fterminal_coding_system, Sterminal_coding_system, 0, 1, 0, - doc: /* Return coding system specified for terminal output on the given display. -DISPLAY may be a display id, a frame, or nil for the selected frame's display. */) - (display) - Lisp_Object display; + doc: /* Return coding system specified for terminal output on the given device. +DEVICE may be a display device id, a frame, or nil for the selected +frame's display device. */) + (device) + Lisp_Object device; { - return DISPLAY_TERMINAL_CODING (get_display (display, 1))->symbol; + return DEVICE_TERMINAL_CODING (get_device (device, 1))->symbol; } DEFUN ("set-keyboard-coding-system-internal", Fset_keyboard_coding_system_internal, Sset_keyboard_coding_system_internal, 1, 2, 0, doc: /* Internal use only. */) - (coding_system, display) + (coding_system, device) Lisp_Object coding_system; - Lisp_Object display; + Lisp_Object device; { - struct display *d = get_display (display, 1); + struct device *d = get_device (device, 1); CHECK_SYMBOL (coding_system); setup_coding_system (Fcheck_coding_system (coding_system), - DISPLAY_KEYBOARD_CODING (d)); + DEVICE_KEYBOARD_CODING (d)); /* Character composition should be disabled. */ - DISPLAY_KEYBOARD_CODING (d)->composing = COMPOSITION_DISABLED; + DEVICE_KEYBOARD_CODING (d)->composing = COMPOSITION_DISABLED; return Qnil; } DEFUN ("keyboard-coding-system", Fkeyboard_coding_system, Skeyboard_coding_system, 0, 1, 0, doc: /* Return coding system specified for decoding keyboard input. */) - (display) - Lisp_Object display; + (device) + Lisp_Object device; { - return DISPLAY_KEYBOARD_CODING (get_display (display, 1))->symbol; + return DEVICE_KEYBOARD_CODING (get_device (device, 1))->symbol; }