summaryrefslogtreecommitdiff
path: root/lisp/term
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/term')
-rw-r--r--lisp/term/AT386.el4
-rw-r--r--lisp/term/internal.el2
-rw-r--r--lisp/term/iris-ansi.el4
-rw-r--r--lisp/term/lk201.el4
-rw-r--r--lisp/term/mac-win.el4
-rw-r--r--lisp/term/news.el2
-rw-r--r--lisp/term/rxvt.el4
-rw-r--r--lisp/term/sun.el2
-rw-r--r--lisp/term/tvi970.el16
-rw-r--r--lisp/term/vt200.el2
-rw-r--r--lisp/term/vt201.el2
-rw-r--r--lisp/term/vt220.el2
-rw-r--r--lisp/term/vt240.el2
-rw-r--r--lisp/term/vt300.el2
-rw-r--r--lisp/term/vt320.el2
-rw-r--r--lisp/term/vt400.el2
-rw-r--r--lisp/term/vt420.el2
-rw-r--r--lisp/term/wyse50.el4
-rw-r--r--lisp/term/x-win.el2
-rw-r--r--lisp/term/xterm.el6
20 files changed, 35 insertions, 35 deletions
diff --git a/lisp/term/AT386.el b/lisp/term/AT386.el
index 6ab8cd9dea..fc86e8bcaf 100644
--- a/lisp/term/AT386.el
+++ b/lisp/term/AT386.el
@@ -31,7 +31,7 @@
(if (boundp 'AT386-keypad-map)
nil
;; The terminal initialization should already have set up some keys
- (setq AT386-keypad-map (lookup-key (terminal-local-value 'function-key-map nil) "\e["))
+ (setq AT386-keypad-map (lookup-key (terminal-local-value 'local-function-key-map nil) "\e["))
(if (not (keymapp AT386-keypad-map))
(error "What? Your AT386 termcap/terminfo has no keycaps in it"))
@@ -54,7 +54,7 @@
(define-key AT386-keypad-map "T" [kp-add])
;; Arrange for the ALT key to be equivalent to ESC
- (define-key (terminal-local-value 'function-key-map nil) "\eN" [27]) ; ALT map
+ (define-key (terminal-local-value 'local-function-key-map nil) "\eN" [27]) ; ALT map
)
;;; arch-tag: abec1b03-582f-49f8-b8cb-e2fd52ea4bd7
diff --git a/lisp/term/internal.el b/lisp/term/internal.el
index 76a375cf74..398d848aeb 100644
--- a/lisp/term/internal.el
+++ b/lisp/term/internal.el
@@ -28,7 +28,7 @@
;; ---------------------------------------------------------------------------
;; keyboard setup -- that's simple!
(set-input-mode nil nil 0)
-(let (m (terminal-local-value 'function-key-map nil))
+(let (m (terminal-local-value 'local-function-key-map nil))
(define-key m [backspace] "\177") ; Normal behaviour for BS
(define-key m [delete] "\C-d") ; ... and Delete
(define-key m [tab] [?\t])
diff --git a/lisp/term/iris-ansi.el b/lisp/term/iris-ansi.el
index bf9b23bdf6..4d99c3a355 100644
--- a/lisp/term/iris-ansi.el
+++ b/lisp/term/iris-ansi.el
@@ -333,8 +333,8 @@
;; This way we don't override terminfo-derived settings or settings
;; made in the .emacs file.
(let ((m (copy-keymap iris-function-map)))
- (set-keymap-parent m (keymap-parent (terminal-local-value 'function-key-map nil)))
- (set-keymap-parent (terminal-local-value 'function-key-map nil) m))
+ (set-keymap-parent m (keymap-parent (terminal-local-value 'local-function-key-map nil)))
+ (set-keymap-parent (terminal-local-value 'local-function-key-map nil) m))
;;; arch-tag: b1d0e73a-bb7d-47be-9fb2-6fb126469a1b
;;; iris-ansi.el ends here
diff --git a/lisp/term/lk201.el b/lisp/term/lk201.el
index 8e40a25070..84d5660cb5 100644
--- a/lisp/term/lk201.el
+++ b/lisp/term/lk201.el
@@ -79,8 +79,8 @@
;; This way we don't override terminfo-derived settings or settings
;; made in the .emacs file.
(let ((m (copy-keymap lk201-function-map)))
- (set-keymap-parent m (keymap-parent (terminal-local-value 'function-key-map nil)))
- (set-keymap-parent (terminal-local-value 'function-key-map nil) m))
+ (set-keymap-parent m (keymap-parent (terminal-local-value 'local-function-key-map nil)))
+ (set-keymap-parent (terminal-local-value 'local-function-key-map nil) m))
;;; arch-tag: 7ffb4444-6a23-43e1-b457-43cf4f673c0d
;;; lk201.el ends here
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index 03971a95db..8b538050b2 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -1059,7 +1059,7 @@ XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp")
;; Map certain keypad keys into ASCII characters
;; that people usually expect.
-(let ((m (terminal-local-value 'function-key-map nil)))
+(let ((m (terminal-local-value 'local-function-key-map nil)))
(define-key m [backspace] [?\d])
(define-key m [delete] [?\d])
(define-key m [tab] [?\t])
@@ -1140,7 +1140,7 @@ correspoinding TextEncodingBase value."
(set-keyboard-coding-system (or coding-system 'mac-roman))
;; MacJapanese maps reverse solidus to ?\x80.
(if (eq coding-system 'japanese-shift-jis)
- (define-key global-key-translation-map [?\x80] "\\"))))
+ (define-key key-translation-map [?\x80] "\\"))))
(define-key special-event-map [language-change] 'mac-handle-language-change)
diff --git a/lisp/term/news.el b/lisp/term/news.el
index 6bd6861133..d5afab190d 100644
--- a/lisp/term/news.el
+++ b/lisp/term/news.el
@@ -31,7 +31,7 @@
(if (boundp 'news-fkey-prefix)
nil
;; The terminal initialization should already have set up some keys
- (setq news-fkey-prefix (lookup-key (terminal-local-value 'function-key-map nil) "\eO"))
+ (setq news-fkey-prefix (lookup-key (terminal-local-value 'local-function-key-map nil) "\eO"))
(if (not (keymapp news-fkey-prefix))
(error "What? Your news termcap/terminfo has no keycaps in it"))
diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el
index 9a1acf0d1a..bb85c79f21 100644
--- a/lisp/term/rxvt.el
+++ b/lisp/term/rxvt.el
@@ -100,8 +100,8 @@
;; This way we don't override terminfo-derived settings or settings
;; made in the .emacs file.
(let ((m (copy-keymap rxvt-function-map)))
- (set-keymap-parent m (keymap-parent (terminal-local-value 'function-key-map nil)))
- (set-keymap-parent (terminal-local-value 'function-key-map nil) m))
+ (set-keymap-parent m (keymap-parent (terminal-local-value 'local-function-key-map nil)))
+ (set-keymap-parent (terminal-local-value 'local-function-key-map nil) m))
;; Set up colors, for those versions of rxvt that support it.
diff --git a/lisp/term/sun.el b/lisp/term/sun.el
index 85ee3b4386..1701847551 100644
--- a/lisp/term/sun.el
+++ b/lisp/term/sun.el
@@ -93,7 +93,7 @@
;;
(defvar sun-raw-prefix (make-sparse-keymap))
-(define-key (terminal-local-value 'function-key-map nil) "\e[" sun-raw-prefix)
+(define-key (terminal-local-value 'local-function-key-map nil) "\e[" sun-raw-prefix)
(define-key sun-raw-prefix "210z" [r3])
(define-key sun-raw-prefix "213z" [r6])
diff --git a/lisp/term/tvi970.el b/lisp/term/tvi970.el
index 54b1b6bc3a..30bc6184d7 100644
--- a/lisp/term/tvi970.el
+++ b/lisp/term/tvi970.el
@@ -28,14 +28,14 @@
;;; Code:
-(or (lookup-key (terminal-local-value 'function-key-map nil) "\e[")
- (define-key (terminal-local-value 'function-key-map nil) "\e[" (make-keymap)))
-;; (or (lookup-key (terminal-local-value 'function-key-map nil) "\eO")
-;; (define-key (terminal-local-value 'function-key-map nil) "\eO" (make-keymap)))
+(or (lookup-key (terminal-local-value 'local-function-key-map nil) "\e[")
+ (define-key (terminal-local-value 'local-function-key-map nil) "\e[" (make-keymap)))
+;; (or (lookup-key (terminal-local-value 'local-function-key-map nil) "\eO")
+;; (define-key (terminal-local-value 'local-function-key-map nil) "\eO" (make-keymap)))
;; Miscellaneous keys
(mapcar (function (lambda (key-binding)
- (define-key (terminal-local-value 'function-key-map nil)
+ (define-key (terminal-local-value 'local-function-key-map nil)
(car key-binding) (nth 1 key-binding))))
'(
;; These are set up by termcap or terminfo
@@ -84,17 +84,17 @@
;; The numeric keypad keys.
(let ((i 0))
(while (< i 10)
- (define-key (terminal-local-value 'function-key-map nil)
+ (define-key (terminal-local-value 'local-function-key-map nil)
(format "\eO%c" (+ i ?p))
(vector (intern (format "kp-%d" i))))
(setq i (1+ i))))
;; The numbered function keys.
(let ((i 0))
(while (< i 16)
- (define-key (terminal-local-value 'function-key-map nil)
+ (define-key (terminal-local-value 'local-function-key-map nil)
(format "\e?%c" (+ i ?a))
(vector (intern (format "f%d" (1+ i)))))
- (define-key (terminal-local-value 'function-key-map nil)
+ (define-key (terminal-local-value 'local-function-key-map nil)
(format "\e?%c" (+ i ?A))
(vector (intern (format "S-f%d" (1+ i)))))
(setq i (1+ i))))
diff --git a/lisp/term/vt200.el b/lisp/term/vt200.el
index 0ff0a30f56..e33b4f2905 100644
--- a/lisp/term/vt200.el
+++ b/lisp/term/vt200.el
@@ -4,7 +4,7 @@
(load "term/vt100" nil t)
;; Make F11 an escape key.
-(define-key function-key-map "\e[23~" [?\e])
+(define-key (terminal-local-value 'local-function-key-map nil) "\e[23~" [?\e])
;;; arch-tag: 0f78f583-9f32-4237-b106-28bcfff21d89
;;; vt200.el ends here
diff --git a/lisp/term/vt201.el b/lisp/term/vt201.el
index d7deeaf11c..bd1f8c3545 100644
--- a/lisp/term/vt201.el
+++ b/lisp/term/vt201.el
@@ -4,7 +4,7 @@
(load "term/vt100" nil t)
;; Make F11 an escape key.
-(define-key function-key-map "\e[23~" [?\e])
+(define-key (terminal-local-value 'local-function-key-map nil) "\e[23~" [?\e])
;;; arch-tag: a6abb38f-60ea-449e-a9e9-3fb8572c52ae
;;; vt201.el ends here
diff --git a/lisp/term/vt220.el b/lisp/term/vt220.el
index 7ea1e3b57f..de03b5f749 100644
--- a/lisp/term/vt220.el
+++ b/lisp/term/vt220.el
@@ -4,7 +4,7 @@
(load "term/vt100" nil t)
;; Make F11 an escape key.
-(define-key function-key-map "\e[23~" [?\e])
+(define-key (terminal-local-value 'local-function-key-map nil) "\e[23~" [?\e])
;;; arch-tag: 98fc4867-a20d-46a1-a276-d7be31e49871
;;; vt220.el ends here
diff --git a/lisp/term/vt240.el b/lisp/term/vt240.el
index 05f0bebe50..f54b47efa5 100644
--- a/lisp/term/vt240.el
+++ b/lisp/term/vt240.el
@@ -4,7 +4,7 @@
(load "term/vt100" nil t)
;; Make F11 an escape key.
-(define-key function-key-map "\e[23~" [?\e])
+(define-key (terminal-local-value 'local-function-key-map nil) "\e[23~" [?\e])
;;; arch-tag: d9f88e9c-02dc-49ff-871c-a415f08e4eb7
;;; vt240.el ends here
diff --git a/lisp/term/vt300.el b/lisp/term/vt300.el
index 871ed234bc..8af8940b1f 100644
--- a/lisp/term/vt300.el
+++ b/lisp/term/vt300.el
@@ -2,7 +2,7 @@
(load "term/vt100" nil t)
;; Make F11 an escape key.
-(define-key function-key-map "\e[23~" [?\e])
+(define-key (terminal-local-value 'local-function-key-map nil) "\e[23~" [?\e])
;;; arch-tag: 876831c9-a6f2-444a-b033-706e6fbc149f
;;; vt300.el ends here
diff --git a/lisp/term/vt320.el b/lisp/term/vt320.el
index c99b8672fc..38da9f795d 100644
--- a/lisp/term/vt320.el
+++ b/lisp/term/vt320.el
@@ -2,7 +2,7 @@
(load "term/vt100" nil t)
;; Make F11 an escape key.
-(define-key function-key-map "\e[23~" [?\e])
+(define-key (terminal-local-value 'local-function-key-map nil) "\e[23~" [?\e])
;;; arch-tag: f9f4c954-0b9e-45f9-b450-a320d32abd9c
;;; vt320.el ends here
diff --git a/lisp/term/vt400.el b/lisp/term/vt400.el
index 666266e2bf..1e77851ce5 100644
--- a/lisp/term/vt400.el
+++ b/lisp/term/vt400.el
@@ -2,7 +2,7 @@
(load "term/vt100" nil t)
;; Make F11 an escape key.
-(define-key function-key-map "\e[23~" [?\e])
+(define-key (terminal-local-value 'local-function-key-map nil) "\e[23~" [?\e])
;;; arch-tag: a70809c5-6b21-42cc-ba20-536683e5e7d5
;;; vt400.el ends here
diff --git a/lisp/term/vt420.el b/lisp/term/vt420.el
index 9ed5fbe135..cac216d682 100644
--- a/lisp/term/vt420.el
+++ b/lisp/term/vt420.el
@@ -2,7 +2,7 @@
(load "term/vt100" nil t)
;; Make F11 an escape key.
-(define-key function-key-map "\e[23~" [?\e])
+(define-key (terminal-local-value 'local-function-key-map nil) "\e[23~" [?\e])
;;; arch-tag: df2f897c-3a12-4b3c-9259-df089f96c160
;;; vt420.el ends here
diff --git a/lisp/term/wyse50.el b/lisp/term/wyse50.el
index 32c667ce7c..b41cd9d10b 100644
--- a/lisp/term/wyse50.el
+++ b/lisp/term/wyse50.el
@@ -37,9 +37,9 @@
;;; Code:
-(define-key (terminal-local-value 'function-key-map nil) "\C-a" (make-keymap))
+(define-key (terminal-local-value 'local-function-key-map nil) "\C-a" (make-keymap))
(mapcar (function (lambda (key-definition)
- (define-key (terminal-local-value 'function-key-map nil)
+ (define-key (terminal-local-value 'local-function-key-map nil)
(car key-definition) (nth 1 key-definition))))
'(
;; These might be set up by termcap and terminfo
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 8a354b15fe..681bb5e600 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1170,7 +1170,7 @@ XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp")
(defun x-setup-function-keys (frame)
"Set up `function-key-map' on FRAME for the X window system."
;; Map certain keypad keys into ASCII characters that people usually expect.
- (let ((m (terminal-local-value 'function-key-map frame)))
+ (let ((m (terminal-local-value 'local-function-key-map frame)))
(define-key m [backspace] [127])
(define-key m [delete] [127])
(define-key m [tab] [?\t])
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index b99430da7c..eb511201fc 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -39,7 +39,7 @@
;; function-key-map. This substitution is needed because if a key
;; definition if found in function-key-map, there are no further
;; lookups in other keymaps.
-(let ((m (terminal-local-value 'function-key-map nil)))
+(let ((m (terminal-local-value 'local-function-key-map nil)))
(substitute-key-definition [f13] [S-f1] m)
(substitute-key-definition [f14] [S-f2] m)
(substitute-key-definition [f15] [S-f3] m)
@@ -250,8 +250,8 @@
;; This way we don't override terminfo-derived settings or settings
;; made in the .emacs file.
(let ((m (copy-keymap xterm-function-map)))
- (set-keymap-parent m (keymap-parent (terminal-local-value 'function-key-map nil)))
- (set-keymap-parent (terminal-local-value 'function-key-map nil) m))
+ (set-keymap-parent m (keymap-parent (terminal-local-value 'local-function-key-map nil)))
+ (set-keymap-parent (terminal-local-value 'local-function-key-map nil) m))
;; Set up colors, for those versions of xterm that support it.
(defvar xterm-standard-colors
generated by cgit v1.2.3 (git 2.46.0) at 2024-09-20 16:41:44 +0000