1 files changed, 17 insertions, 16 deletions

diff --git a/src/coding.c b/src/coding.c
index 79b1c93cb3a..808f1e7d9c2 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -7307,11 +7307,11 @@ Return the corresponding character code in Big5.  */)
 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 ("set-safe-terminal-coding-system-internal", Fset_safe_terminal_coding_sys
 
 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;
 }