Merged in changes from CVS trunk. Plus added lisp/term tweaks.

[gnu-emacs] / lisp / term / vt300.el

diff --git a/lisp/term/vt300.el b/lisp/term/vt300.el
index ff600f47a1ee9d692e305b5aa1fa7e0af5092ad3..593daf552493d2f1d095687a77c144c59f447dd5 100644 (file)
--- a/lisp/term/vt300.el
+++ b/lisp/term/vt300.el
@@ -1,9 +1,9 @@
 ;; -*- no-byte-compile: t -*-
 (defun terminal-init-vt300 ()
-  "Terminal initialization function for vt300."  
-  (load "term/vt100" nil t)
+  "Terminal initialization function for vt300."
+  (terminal-init-vt100)
   ;; Make F11 an escape key.
-  (define-key function-key-map "\e[23~" [?\e]))
+  (define-key (terminal-local-value 'local-function-key-map nil) "\e[23~" [?\e]))
 
 ;;; arch-tag: 876831c9-a6f2-444a-b033-706e6fbc149f
 ;;; vt300.el ends here