[Emacs-diffs] emacs/lisp ChangeLog international/encoded-kb.e...

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/05/20 02:17:57

Modified files:
        lisp           : ChangeLog 
        lisp/international: encoded-kb.el mule.el 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15647&r2=1.15648
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/international/encoded-kb.el?cvsroot=emacs&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/international/mule.el?cvsroot=emacs&r1=1.283&r2=1.284

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15647
retrieving revision 1.15648
diff -u -b -r1.15647 -r1.15648
--- ChangeLog   19 May 2009 22:31:26 -0000      1.15647
+++ ChangeLog   20 May 2009 02:17:50 -0000      1.15648
@@ -1,3 +1,11 @@
+2009-05-20  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * progmodes/cc-mode.el (c-extend-and-neutralize-CPP-line): Renamed

Index: international/encoded-kb.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/international/encoded-kb.el,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- international/encoded-kb.el 8 May 2009 02:24:30 -0000       1.48
+++ international/encoded-kb.el 20 May 2009 02:17:54 -0000      1.49
@@ -351,11 +351,13 @@
     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.

Index: international/mule.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/international/mule.el,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -b -r1.283 -r1.284
--- international/mule.el       18 Mar 2009 07:24:52 -0000      1.283
+++ international/mule.el       20 May 2009 02:17:56 -0000      1.284
@@ -1233,17 +1233,18 @@
 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 @@
       (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 @@
 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 @@
 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 @@
           (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.