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

1 files changed, 17 insertions, 14 deletions

diff --git a/src/data.c b/src/data.c
index 4102af809ca..09cb6c8b40a 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1876,39 +1876,42 @@ If the current binding is global (the default), the value is nil.  */)
   return Qnil;
 }
 
-extern struct display *get_display P_ ((Lisp_Object display, int));
+extern struct device *get_device P_ ((Lisp_Object display, int));
 
 DEFUN ("terminal-local-value", Fterminal_local_value, Sterminal_local_value, 2, 2, 0,
-       doc: /* Return the terminal-local value of SYMBOL on DISPLAY.
+       doc: /* Return the terminal-local value of SYMBOL on DEVICE.
 If SYMBOL is not a terminal-local variable, then return its normal
 value, like `symbol-value'.
 
-DISPLAY may be a display, a frame, or nil (meaning the selected
-frame's display).  */)
-  (symbol, display)
+DEVICE may be a display device id, a frame, or nil (meaning the
+selected frame's display device).  */)
+  (symbol, device)
      Lisp_Object symbol;
-     Lisp_Object display;
+     Lisp_Object device;
 {
   Lisp_Object result;
-  struct display *d = get_display (display, 1);
-  push_display_kboard (d);
+  struct device *d = get_device (device, 1);
+  push_device_kboard (d);
   result = Fsymbol_value (symbol);
   pop_frame_kboard ();
   return result;
 }
 
 DEFUN ("set-terminal-local-value", Fset_terminal_local_value, Sset_terminal_local_value, 3, 3, 0,
-       doc: /* Set the terminal-local binding of SYMBOL on DISPLAY to VALUE.
+       doc: /* Set the terminal-local binding of SYMBOL on DEVICE to VALUE.
 If VARIABLE is not a terminal-local variable, then set its normal
-binding, like `set'.  */)
-  (symbol, display, value)
+binding, like `set'.
+
+DEVICE may be a display device id, a frame, or nil (meaning the
+selected frame's display device).  */)
+  (symbol, device, value)
      Lisp_Object symbol;
-     Lisp_Object display;
+     Lisp_Object device;
      Lisp_Object value;
 {
   Lisp_Object result;
-  struct display *d = get_display (display, 1);
-  push_display_kboard (d);
+  struct device *d = get_device (device, 1);
+  push_device_kboard (d);
   result = Fset (symbol, value);
   pop_frame_kboard ();
   return result;