Merge from emacs--rel--22

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

diff --git a/lisp/term/AT386.el b/lisp/term/AT386.el
index 4afc076..748807f 100644 (file)
--- a/lisp/term/AT386.el
+++ b/lisp/term/AT386.el
@@ -1,16 +1,16 @@
 ;;; AT386.el --- terminal support package for IBM AT keyboards -*- no-byte-compile: t -*-
 
+;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007 Free Software Foundation, Inc.
+
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Keywords: terminals
 
-;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -29,34 +29,35 @@
 
 ;;; Code:
 
-(if (boundp 'AT386-keypad-map)
-    nil
-  ;; The terminal initialization should already have set up some keys
-  (setq AT386-keypad-map (lookup-key function-key-map "\e["))
-  (if (not (keymapp AT386-keypad-map))
-      (error "What?  Your AT386 termcap/terminfo has no keycaps in it"))
-
-  ;; Equivalents of these are set up automatically by termcap/terminfo
-  ;;  (define-key AT386-keypad-map "A" [up])
-  ;;  (define-key AT386-keypad-map "B" [down])
-  ;;  (define-key AT386-keypad-map "C" [right])
-  ;;  (define-key AT386-keypad-map "D" [left])
-
-  ;; These would be set up by terminfo, but not termcap
-  (define-key AT386-keypad-map "H" [home])
-  (define-key AT386-keypad-map "Y" [end])
-  (define-key AT386-keypad-map "U" [next])     ;; PgDn
-  (define-key AT386-keypad-map "V" [prior])    ;; PgUp
-  (define-key AT386-keypad-map "@" [insert])   ;; Ins key
-
-  ;; These are not normally set up by either
-  (define-key AT386-keypad-map "G" [kp-5])     ;; Unlabeled center key
-  (define-key AT386-keypad-map "S" [kp-subtract])
-  (define-key AT386-keypad-map "T" [kp-add])
-
-  ;; Arrange for the ALT key to be equivalent to ESC
-  (define-key function-key-map "\eN" [27]) ; ALT map
-  )
-
-;;; arch-tag: abec1b03-582f-49f8-b8cb-e2fd52ea4bd7
+(defun terminal-init-AT386 ()
+  "Terminal initialization function for AT386."
+  (let ((AT386-keypad-map (lookup-key input-decode-map "\e[")))
+    ;; The terminal initialization should already have set up some keys
+    (if (not (keymapp AT386-keypad-map))
+       (error "What?  Your AT386 termcap/terminfo has no keycaps in it"))
+
+    ;; Equivalents of these are set up automatically by termcap/terminfo
+    ;;  (define-key AT386-keypad-map "A" [up])
+    ;;  (define-key AT386-keypad-map "B" [down])
+    ;;  (define-key AT386-keypad-map "C" [right])
+    ;;  (define-key AT386-keypad-map "D" [left])
+
+    ;; These would be set up by terminfo, but not termcap
+    (define-key AT386-keypad-map "H" [home])
+    (define-key AT386-keypad-map "Y" [end])
+    (define-key AT386-keypad-map "U" [next])   ;; PgDn
+    (define-key AT386-keypad-map "V" [prior])  ;; PgUp
+    (define-key AT386-keypad-map "@" [insert]) ;; Ins key
+
+    ;; These are not normally set up by either
+    (define-key AT386-keypad-map "G" [kp-5])   ;; Unlabeled center key
+    (define-key AT386-keypad-map "S" [kp-subtract])
+    (define-key AT386-keypad-map "T" [kp-add])
+
+    ;; Arrange for the ALT key to be equivalent to ESC
+    (define-key input-decode-map "\eN" [ALT])
+    (define-key local-function-key-map [ALT] [27])
+    ))
+
+;; arch-tag: abec1b03-582f-49f8-b8cb-e2fd52ea4bd7
 ;;; AT386.el ends here