(x-setup-function-keys): Protect against

multiple calls on the same terminal.

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 4a3a685f8c0733b8dcdebb9c5e869e12d4505e6e..7ea8f08a67e4f5014108c7245affe328b7ec3639 100644 (file)
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -1057,14 +1057,17 @@ XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp")
 
 (defun x-setup-function-keys (frame)
   "Setup Function Keys for w32."
-  (with-selected-frame frame
-     (define-key local-function-key-map [f10] 'menu-bar-open)
+  ;; Don't do this twice on the same display, or it would break
+  ;; normal-erase-is-backspace-mode (maybe - this is copied from X).
+  (unless (terminal-parameter frame 'x-setup-function-keys)
+    (with-selected-frame frame
+      (define-key local-function-key-map [f10] 'menu-bar-open)
 
-     (substitute-key-definition 'suspend-emacs 'iconify-or-deiconify-frame
-                                local-function-key-map global-map)
+      (substitute-key-definition 'suspend-emacs 'iconify-or-deiconify-frame
+                                 local-function-key-map global-map)
 
-     (define-key local-function-key-map [S-tab] [backtab]))
-  (set-terminal-parameter frame 'x-setup-function-keys t))
+      (define-key local-function-key-map [S-tab] [backtab]))
+    (set-terminal-parameter frame 'x-setup-function-keys t)))
 \f
 
 ;; W32 systems have different fonts than commonly found on X, so