Use key-translate instead of keyboard-translate

As a consequence of the discussions in Bug#65735, move to using the
new key-translate function instead of the deprecated
keyboard-translate.

For future maintainers: ?\C-? or ?\177 do not mean "DEL" with
key-translate, you have to use "DEL".

* lisp/simple.el (normal-erase-is-backspace-mode): Use key-translate.
* lisp/term/bobcat.el (terminal-init-bobcat): Use key-translate.

diff --git a/lisp/simple.el b/lisp/simple.el
index 2cb3f45866c526ee0bab8bc8e54b747112e9634d..ec14bec9e07a898a89ba7b3754e526b69b08876e 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -10671,10 +10671,10 @@ See also `normal-erase-is-backspace'."
          (t
           (if enabled
               (progn
-                (keyboard-translate ?\C-h ?\C-?)
-                (keyboard-translate ?\C-? ?\C-d))
-            (keyboard-translate ?\C-h ?\C-h)
-            (keyboard-translate ?\C-? ?\C-?))))
+                 (key-translate "C-h" "DEL")
+                 (key-translate "DEL" "C-d"))
+             (key-translate "C-h" "C-h")
+             (key-translate "DEL" "DEL"))))
 
     (if (called-interactively-p 'interactive)
        (message "Delete key deletes %s"

diff --git a/lisp/term/bobcat.el b/lisp/term/bobcat.el
index 983c8cded2f97e1ef28c53e8f96e8d5a7a2c645c..0c2eba486a35a352d4857c68a0a4fb23b78bed44 100644 (file)
--- a/lisp/term/bobcat.el
+++ b/lisp/term/bobcat.el
@@ -3,8 +3,8 @@
 (defun terminal-init-bobcat ()
   "Terminal initialization function for bobcat."
   ;; HP terminals usually encourage using ^H as the rubout character
-  (keyboard-translate ?\177 ?\^h)
-  (keyboard-translate ?\^h ?\177))
+  (key-translate "DEL" "C-h")
+  (key-translate "C-h" "DEL"))
 
 (provide 'term/bobcat)