Merged from emacs@sv.gnu.org

[bpt/emacs.git] / lisp / term / AT386.el

diff --git a/lisp/term/AT386.el b/lisp/term/AT386.el
index 7e3ed15..2f98e7b 100644 (file)
--- a/lisp/term/AT386.el
+++ b/lisp/term/AT386.el
@@ -3,7 +3,8 @@
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Keywords: terminals
 
-;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -30,10 +31,8 @@
 
 (defun terminal-init-AT386 ()
   "Terminal initialization function for AT386."
-  (if (boundp 'AT386-keypad-map)
-      nil
+  (let ((AT386-keypad-map (lookup-key local-function-key-map "\e[")))
     ;; The terminal initialization should already have set up some keys
-    (setq AT386-keypad-map (lookup-key (terminal-local-value 'local-function-key-map nil) "\e["))
     (if (not (keymapp AT386-keypad-map))
        (error "What?  Your AT386 termcap/terminfo has no keycaps in it"))
 
@@ -56,7 +55,7 @@
     (define-key AT386-keypad-map "T" [kp-add])
 
     ;; Arrange for the ALT key to be equivalent to ESC
-    (define-key (terminal-local-value 'local-function-key-map nil) "\eN" [27]) ; ALT map
+    (define-key local-function-key-map "\eN" [27]) ; ALT map
     ))
 
 ;;; arch-tag: abec1b03-582f-49f8-b8cb-e2fd52ea4bd7