Mercurial > emacs

comparison lisp/term/rxvt.el @ 83394:7d093d9d4479

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix semantics of terminal-local variables. Remove `terminal-local-value' hack. * src/data.c (do_symval_forwarding, store_symval_forwarding) (find_symbol_value): Use the selected frame's keyboard, not current_kboard. * src/data.c (Fterminal_local_value, Fset_terminal_local_value): Disable these functions. * src/data.c (syms_of_data): Don't defsubr them. * lisp/edmacro.el (edmacro-format-keys): Remove terminal-local-value calls. * lisp/emulation/cua-base.el (cua--pre-command-handler-1): Ditto. * lisp/international/encoded-kb.el (encoded-kbd-setup-display): Ditto. * lisp/isearch.el (isearch-other-meta-char): Ditto. * lisp/obsolete/keyswap.el (the-table): Ditto. * lisp/simple.el (normal-erase-is-backspace-mode): Ditto. * lisp/subr.el (keyboard-translate, read-quoted-char): Ditto. * lisp/term/AT386.el (terminal-init-AT386): Ditto. * lisp/term/internal.el: Ditto. * lisp/term/iris-ansi.el (terminal-init-iris-ansi): Ditto. * lisp/term/lk201.el (terminal-init-lk201): Ditto. * lisp/term/mac-win.el: Ditto. * lisp/term/news.el (terminal-init-news): Ditto. * lisp/term/rxvt.el (terminal-init-rxvt): Ditto. * lisp/term/sun.el (terminal-init-sun): Ditto. * lisp/term/tvi970.el (terminal-init-tvi970): Ditto. * lisp/term/vt200.el (terminal-init-vt200): Ditto. * lisp/term/vt201.el (terminal-init-vt201): Ditto. * lisp/term/vt220.el (terminal-init-vt220): Ditto. * lisp/term/vt240.el (terminal-init-vt240): Ditto. * lisp/term/vt300.el (terminal-init-vt300): Ditto. * lisp/term/vt320.el (terminal-init-vt320): Ditto. * lisp/term/vt400.el (terminal-init-vt400): Ditto. * lisp/term/vt420.el (terminal-init-vt420): Ditto. * lisp/term/wyse50.el (terminal-init-wyse50): Ditto. * lisp/term/x-win.el (x-setup-function-keys): Ditto. * lisp/term/xterm.el (terminal-init-xterm): Ditto. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-434
author Karoly Lorentey <lorentey@elte.hu>
date Sat, 29 Oct 2005 11:50:12 +0000
parents 2a679c81f552
children 51eb0aa362f3
comparison
equal deleted inserted replaced
83393:38af4e693f4e 83394:7d093d9d4479
130 ;; MODIFIER-FUNCTION_KEY, where modifier is S-, C-, C-S-. The 130 ;; MODIFIER-FUNCTION_KEY, where modifier is S-, C-, C-S-. The
131 ;; code here subsitutes the corresponding defintions in 131 ;; code here subsitutes the corresponding defintions in
132 ;; function-key-map. This substitution is needed because if a key 132 ;; function-key-map. This substitution is needed because if a key
133 ;; definition if found in function-key-map, there are no further 133 ;; definition if found in function-key-map, there are no further
134 ;; lookups in other keymaps. 134 ;; lookups in other keymaps.
135 (let ((m (terminal-local-value 'local-function-key-map nil))) 135 (substitute-key-definition [f11] [S-f1] local-function-key-map)
136 (substitute-key-definition [f11] [S-f1] m) 136 (substitute-key-definition [f12] [S-f2] local-function-key-map)
137 (substitute-key-definition [f12] [S-f2] m) 137 (substitute-key-definition [f13] [S-f3] local-function-key-map)
138 (substitute-key-definition [f13] [S-f3] m) 138 (substitute-key-definition [f14] [S-f4] local-function-key-map)
139 (substitute-key-definition [f14] [S-f4] m) 139 (substitute-key-definition [f15] [S-f5] local-function-key-map)
140 (substitute-key-definition [f15] [S-f5] m) 140 (substitute-key-definition [f16] [S-f6] local-function-key-map)
141 (substitute-key-definition [f16] [S-f6] m) 141 (substitute-key-definition [f17] [S-f7] local-function-key-map)
142 (substitute-key-definition [f17] [S-f7] m) 142 (substitute-key-definition [f18] [S-f8] local-function-key-map)
143 (substitute-key-definition [f18] [S-f8] m) 143 (substitute-key-definition [f19] [S-f9] local-function-key-map)
144 (substitute-key-definition [f19] [S-f9] m) 144 (substitute-key-definition [f20] [S-f10] local-function-key-map)
145 (substitute-key-definition [f20] [S-f10] m) 145
146 146 (substitute-key-definition [f23] [C-f1] local-function-key-map)
147 (substitute-key-definition [f23] [C-f1] m) 147 (substitute-key-definition [f24] [C-f2] local-function-key-map)
148 (substitute-key-definition [f24] [C-f2] m) 148 (substitute-key-definition [f25] [C-f3] local-function-key-map)
149 (substitute-key-definition [f25] [C-f3] m) 149 (substitute-key-definition [f26] [C-f4] local-function-key-map)
150 (substitute-key-definition [f26] [C-f4] m) 150 (substitute-key-definition [f27] [C-f5] local-function-key-map)
151 (substitute-key-definition [f27] [C-f5] m) 151 (substitute-key-definition [f28] [C-f6] local-function-key-map)
152 (substitute-key-definition [f28] [C-f6] m) 152 (substitute-key-definition [f29] [C-f7] local-function-key-map)
153 (substitute-key-definition [f29] [C-f7] m) 153 (substitute-key-definition [f30] [C-f8] local-function-key-map)
154 (substitute-key-definition [f30] [C-f8] m) 154 (substitute-key-definition [f31] [C-f9] local-function-key-map)
155 (substitute-key-definition [f31] [C-f9] m) 155 (substitute-key-definition [f32] [C-f10] local-function-key-map)
156 (substitute-key-definition [f32] [C-f10] m) 156
157 157 (substitute-key-definition [f33] [C-S-f1] local-function-key-map)
158 (substitute-key-definition [f33] [C-S-f1] m) 158 (substitute-key-definition [f34] [C-S-f2] local-function-key-map)
159 (substitute-key-definition [f34] [C-S-f2] m) 159 (substitute-key-definition [f35] [C-S-f3] local-function-key-map)
160 (substitute-key-definition [f35] [C-S-f3] m) 160 (substitute-key-definition [f36] [C-S-f4] local-function-key-map)
161 (substitute-key-definition [f36] [C-S-f4] m) 161 (substitute-key-definition [f37] [C-S-f5] local-function-key-map)
162 (substitute-key-definition [f37] [C-S-f5] m) 162 (substitute-key-definition [f38] [C-S-f6] local-function-key-map)
163 (substitute-key-definition [f38] [C-S-f6] m) 163 (substitute-key-definition [f39] [C-S-f7] local-function-key-map)
164 (substitute-key-definition [f39] [C-S-f7] m) 164 (substitute-key-definition [f40] [C-S-f8] local-function-key-map)
165 (substitute-key-definition [f40] [C-S-f8] m) 165 (substitute-key-definition [f41] [C-S-f9] local-function-key-map)
166 (substitute-key-definition [f41] [C-S-f9] m) 166 (substitute-key-definition [f42] [C-S-f10] local-function-key-map)
167 (substitute-key-definition [f42] [C-S-f10] m))
168 167
169 ;; Use inheritance to let the main keymap override those defaults. 168 ;; Use inheritance to let the main keymap override those defaults.
170 ;; This way we don't override terminfo-derived settings or settings 169 ;; This way we don't override terminfo-derived settings or settings
171 ;; made in the .emacs file. 170 ;; made in the .emacs file.
172 (let ((m (copy-keymap rxvt-function-map))) 171 (let ((m (copy-keymap rxvt-function-map)))
173 (set-keymap-parent m (keymap-parent (terminal-local-value 'local-function-key-map nil))) 172 (set-keymap-parent m (keymap-parent local-function-key-map))
174 (set-keymap-parent (terminal-local-value 'local-function-key-map nil) m))) 173 (set-keymap-parent local-function-key-map m)))
175 174
176 ;; Initialize colors and background mode. 175 ;; Initialize colors and background mode.
177 (rxvt-register-default-colors) 176 (rxvt-register-default-colors)
178 (rxvt-set-background-mode) 177 (rxvt-set-background-mode)
179 ;; This recomputes all the default faces given the colors we've just set up. 178 ;; This recomputes all the default faces given the colors we've just set up.