diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-10-22 19:31:43 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-10-22 19:31:43 +0000 |
| commit | 28a90c44b4f5009470b6d2ecbea3b9c6e5fa5180 (patch) | |
| tree | 6c9a3d88938e8c08d5dbb9eb789b6b079a8dada4 /lisp/simple.el | |
| parent | a452eee82d9dfff06caa64cec4480362c2b0ad03 (diff) | |
| download | emacs-28a90c44b4f5009470b6d2ecbea3b9c6e5fa5180.tar.gz | |
* simple.el (normal-erase-is-backspace-mode): Use input-decode-map
rather than fiddling with global-map bindings, since it should only
affect per-terminal settings.
See http://bugs.gentoo.org/show_bug.cgi?id=289709.
Diffstat (limited to 'lisp/simple.el')
| -rw-r--r-- | lisp/simple.el | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/lisp/simple.el b/lisp/simple.el index 34107edf432..ed9f57fc773 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -6415,31 +6415,27 @@ See also `normal-erase-is-backspace'." (let* ((bindings `(([M-delete] [M-backspace]) ([C-M-delete] [C-M-backspace]) - (,esc-map - [C-delete] [C-backspace]))) + ([?\e C-delete] [?\e C-backspace]))) (old-state (lookup-key local-function-key-map [delete]))) (if enabled (progn (define-key local-function-key-map [delete] [?\C-d]) (define-key local-function-key-map [kp-delete] [?\C-d]) - (define-key local-function-key-map [backspace] [?\C-?])) + (define-key local-function-key-map [backspace] [?\C-?]) + (dolist (b bindings) + ;; Not sure if input-decode-map is really right, but + ;; keyboard-translate-table (used below) only works + ;; for integer events, and key-translation-table is + ;; global (like the global-map, used earlier). + (define-key input-decode-map (car b) nil) + (define-key input-decode-map (cadr b) nil))) (define-key local-function-key-map [delete] [?\C-?]) (define-key local-function-key-map [kp-delete] [?\C-?]) - (define-key local-function-key-map [backspace] [?\C-?])) - - ;; Maybe swap bindings of C-delete and C-backspace, etc. - (unless (equal old-state (lookup-key local-function-key-map [delete])) - (dolist (binding bindings) - (let ((map global-map)) - (when (keymapp (car binding)) - (setq map (car binding) binding (cdr binding))) - (let* ((key1 (nth 0 binding)) - (key2 (nth 1 binding)) - (binding1 (lookup-key map key1)) - (binding2 (lookup-key map key2))) - (define-key map key1 binding2) - (define-key map key2 binding1))))))) + (define-key local-function-key-map [backspace] [?\C-?]) + (dolist (b bindings) + (define-key input-decode-map (car b) (cadr b)) + (define-key input-decode-map (cadr b) (car b)))))) (t (if enabled (progn |