(x-setup-function-keys): Remove.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 18de50ed4ccc2d961d21a6a0fceada24259ea048..34215cd55a76d0636e645568ccb1fab2b8742349 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2007-11-21  Jason Rumney  <jasonr@gnu.org>
+
+       * term/w32console.el: New term init file for w32 console.
+
+       * w32-fns.el (x-alternatives-map): Copy from term/x-win.el.
+       (x-setup-function-keys): Likewise, replacing top-level key definitions.
+       (w32-tty-standard-colors): Move to term/w32console.el.
+
+       * term/w32-win.el (x-setup-function-keys): Remove.
+
+       * term/tty-colors.el (tty-register-default-colors): Remove special
+       case for w32.
+
 2007-11-21  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * frame.el (msdos-mouse-p):

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 90b88f359bc87464297ef367384338a3c5b93aaf..7fd84a898fc43b6812478356434c4dc90b1da7be 100644 (file)
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -1058,20 +1058,6 @@ XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp")
  If FRAME is nil or not given, use the selected frame."
    (interactive "i")
    (w32-send-sys-command ?\xf100 frame))
-
-(defun x-setup-function-keys (frame)
-  "Setup Function Keys for w32."
-  ;; 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)
-
-      (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