mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

(encoded-kbd-setup-display):

Browse source 
Use input-decode-map rather than local-key-translation-map.
This commit is contained in:
Stefan Monnier 2007-10-09 05:17:21 +00:00
parent 8e33712945
commit f49f5ca9c4
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -1,5 +1,8 @@
2007-10-09 Stefan Monnier <monnier@iro.umontreal.ca>
* international/encoded-kb.el (encoded-kbd-setup-display):
Use input-decode-map rather than local-key-translation-map.
* term/rxvt.el (rxvt-alternatives-map): New map.
(terminal-init-rxvt): Use it.
Bind rxvt-function-map in input-decode-map.

16
lisp/international/encoded-kb.el
View file

@ -31,7 +31,7 @@
;; Usually this map is empty (even if Encoded-kbd mode is on), but if
;; the keyboard coding system is iso-2022-based, it defines dummy key
;; bindings for ESC $ ..., etc. so that those bindings in
;; key-translation-map take effect.
;; input-decode-map take effect.
(defconst encoded-kbd-mode-map (make-sparse-keymap)
"Keymap for Encoded-kbd minor mode.")
@ -255,16 +255,16 @@ The following key sequence may cause multilingual text insertion."
;;;###autoload
(defun encoded-kbd-setup-display (display)
"Set up a `key-translation-map' for `keyboard-coding-system' on DISPLAY.
"Set up a `input-decode-map' for `keyboard-coding-system' on DISPLAY.
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)))))
(when frame
(with-selected-frame frame
;; Remove any previous encoded-kb keymap from key-translation-map.
(let ((m local-key-translation-map))
;; Remove any previous encoded-kb keymap from input-decode-map.
(let ((m input-decode-map))
(if (equal (keymap-prompt m) "encoded-kb")
(setq local-key-translation-map (keymap-parent m))
(setq input-decode-map (keymap-parent m))
(while (keymap-parent m)
(if (equal (keymap-prompt (keymap-parent m)) "encoded-kb")
(set-keymap-parent m (keymap-parent (keymap-parent m))))
@ -276,8 +276,8 @@ DISPLAY may be a display id, a frame, or nil for the selected frame's display."
(keymap (make-sparse-keymap "encoded-kb"))
(cim (current-input-mode))
result)
(set-keymap-parent keymap local-key-translation-map)
(setq local-key-translation-map keymap)
(set-keymap-parent keymap input-decode-map)
(setq input-decode-map keymap)
(unless (terminal-parameter nil 'encoded-kbd-saved-input-meta-mode)
(set-terminal-parameter nil 'encoded-kbd-saved-input-mode (nth 2 cim)))
(setq result (and coding (encoded-kbd-setup-keymap keymap coding)))
@ -297,5 +297,5 @@ DISPLAY may be a display id, a frame, or nil for the selected frame's display."
(provide 'encoded-kb)
;;; arch-tag: 76f0f9b3-65e7-45c3-b692-59509a87ad44
;; arch-tag: 76f0f9b3-65e7-45c3-b692-59509a87ad44
;;; encoded-kb.el ends here