* international/encoded-kb.el (encoded-kbd-setup-display): Change

DISPLAY arg to TERMINAL.

* international/mule.el (set-terminal-coding-system)
(set-keyboard-coding-system): Change DISPLAY arg to TERMINAL.

3 files changed, 27 insertions, 15 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df4ec143491..4445dd3461f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2009-05-20  Chong Yidong  <cyd@stupidchicken.com>
+
+        * international/encoded-kb.el (encoded-kbd-setup-display): Change
+        DISPLAY arg to TERMINAL.
+
+        * international/mule.el (set-terminal-coding-system)
+        (set-keyboard-coding-system): Change DISPLAY arg to TERMINAL.
+
 2009-05-19  Alan Mackenzie  <acm@muc.de>
 
         * progmodes/cc-mode.el (c-extend-and-neutralize-CPP-line): Renamed
diff --git a/lisp/international/encoded-kb.el b/lisp/international/encoded-kb.el
index a2efd390fc6..62fd6f1c17b 100644
--- a/lisp/international/encoded-kb.el
+++ b/lisp/international/encoded-kb.el
@@ -351,11 +351,13 @@ The following key sequence may cause multilingual text insertion."
     nil)))
 
 ;;;###autoload
-(defun encoded-kbd-setup-display (display)
-  "Set up a `input-decode-map' for `keyboard-coding-system' on DISPLAY.
+(defun encoded-kbd-setup-display (terminal)
+  "Set up a `input-decode-map' for `keyboard-coding-system' on TERMINAL.
 
-DISPLAY may be a display id, a frame, or nil for the selected frame's display."
-  (let ((frame (if (framep display) display (car (frames-on-display-list display)))))
+TERMINAL may be a terminal id, a frame, or nil for the selected frame's terminal."
+  (let ((frame (if (framep terminal)
+                   terminal
+                 (car (frames-on-display-list terminal)))))
     (when frame
       (with-selected-frame frame
         ;; Remove any previous encoded-kb keymap from input-decode-map.
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 236b48c9bdb..dc96d21bdbb 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1233,17 +1233,18 @@ to CODING-SYSTEM."
 This is normally set according to the selected language environment.
 See also the command `set-terminal-coding-system'.")
 
-(defun set-terminal-coding-system (coding-system &optional display)
+(defun set-terminal-coding-system (coding-system &optional terminal)
   "Set coding system of terminal output to CODING-SYSTEM.
-All text output to DISPLAY will be encoded
+All text output to TERMINAL will be encoded
 with the specified coding system.
 
 For a list of possible values of CODING-SYSTEM, use \\[list-coding-systems].
 The default is determined by the selected language environment
 or by the previous use of this command.
 
-DISPLAY may be a display id, a frame, or nil for the selected frame's display.
-The setting has no effect on graphical displays."
+TERMINAL may be a terminal object, a frame, or nil for the
+selected frame's terminal.  The setting has no effect on
+graphical terminals."
   (interactive
    (list (let ((default (if (and (not (terminal-coding-system))
                                  default-terminal-coding-system)
@@ -1257,7 +1258,7 @@ The setting has no effect on graphical displays."
       (setq coding-system default-terminal-coding-system))
   (if coding-system
       (setq default-terminal-coding-system coding-system))
-  (set-terminal-coding-system-internal coding-system display)
+  (set-terminal-coding-system-internal coding-system terminal)
   (redraw-frame (selected-frame)))
 
 (defvar default-keyboard-coding-system nil
@@ -1265,8 +1266,8 @@ The setting has no effect on graphical displays."
 This is normally set according to the selected language environment.
 See also the command `set-keyboard-coding-system'.")
 
-(defun set-keyboard-coding-system (coding-system &optional display)
-  "Set coding system for keyboard input on DISPLAY to CODING-SYSTEM.
+(defun set-keyboard-coding-system (coding-system &optional terminal)
+  "Set coding system for keyboard input on TERMINAL to CODING-SYSTEM.
 In addition, this command calls `encoded-kbd-setup-display' to set up the
 translation of keyboard input events to the specified coding system.
 
@@ -1274,8 +1275,9 @@ For a list of possible values of CODING-SYSTEM, use \\[list-coding-systems].
 The default is determined by the selected language environment
 or by the previous use of this command.
 
-DISPLAY may be a display id, a frame, or nil for the selected frame's display.
-The setting has no effect on graphical displays."
+TERMINAL may be a terminal object, a frame, or nil for the
+selected frame's terminal.  The setting has no effect on
+graphical terminals."
   (interactive
    (list (let ((default (if (and (not (keyboard-coding-system))
                                  default-keyboard-coding-system)
@@ -1293,9 +1295,9 @@ The setting has no effect on graphical displays."
            (not (coding-system-get coding-system :ascii-compatible-p))
            (not (coding-system-get coding-system :suitable-for-keyboard)))
       (error "%s is not suitable for keyboard" coding-system))
-  (set-keyboard-coding-system-internal coding-system display)
+  (set-keyboard-coding-system-internal coding-system terminal)
   (setq keyboard-coding-system coding-system)
-  (encoded-kbd-setup-display display))
+  (encoded-kbd-setup-display terminal))
 
 (defcustom keyboard-coding-system nil
   "Specify coding system for keyboard input.