(timer-error, timer-abnormal-termination,

[gnu-emacs] / lisp / terminal.el

diff --git a/lisp/terminal.el b/lisp/terminal.el
index 939791e16918cafbd395816e043aa5fb9c0b0795..7a9235f36ee3358f97ebdba6aeb3c0ff2f491d4b 100644 (file)
--- a/lisp/terminal.el
+++ b/lisp/terminal.el
@@ -1,6 +1,6 @@
 ;;; terminal.el --- terminal emulator for GNU Emacs.
 
-;; Copyright (C) 1986, 1987, 1988, 1989, 1993 Free Software Foundation, Inc.
+;; Copyright (C) 1986,87,88,89,93,94 Free Software Foundation, Inc.
 
 ;; Author: Richard Mlynarik <mly@eddie.mit.edu>
 ;; Maintainer: FSF
@@ -77,6 +77,7 @@ performance.")
     nil
   (let ((map (make-sparse-keymap)))
     (define-key map [t] 'te-pass-through)
+    (define-key map [switch-frame] 'handle-switch-frame)
     (define-key map "\e" terminal-meta-map)
     ;(define-key map "\C-l"
     ;  '(lambda () (interactive) (te-pass-through) (redraw-display)))
@@ -484,7 +485,7 @@ lets you type a terminal emulator command."
 (defun terminal-edit-mode ()
   "Major mode for editing the contents of a terminal-emulator buffer.
 The editing commands are the same as in Fundamental mode,
-together with a command \\<terminal-edit-mode-map>to return to terminal emulation: \\[terminal-cease-edit]."
+together with a command \\<terminal-edit-map>to return to terminal emulation: \\[terminal-cease-edit]."
   (use-local-map terminal-edit-map)
   (setq major-mode 'terminal-edit-mode)
   (setq mode-name "Terminal Edit")
@@ -540,9 +541,10 @@ together with a command \\<terminal-edit-mode-map>to return to terminal emulatio
       (setq te-more-count -1)))
 
   (setq mode-line-modified (default-value 'mode-line-modified))
+  (use-local-map terminal-map)
   (setq major-mode 'terminal-mode)
   (setq mode-name "terminal")
-  (setq mode-line-process '(": %s")))
+  (setq mode-line-process '(":%s")))
 \f
 ;;;; more break hair
 
@@ -1122,10 +1124,6 @@ work with `terminfo' we will try to use it."
          (setq te-process
                (start-process "terminal-emulator" (current-buffer)
                               "/bin/sh" "-c"
-                              ;; Yuck!!! Start a shell to set some terminal
-                              ;; control characteristics.  Then start the
-                              ;; "env" program to setup the terminal type
-                              ;; Then finally start the program we wanted.
                               (format "%s; exec %s"
                                       te-stty-string
                                       (mapconcat 'te-quote-arg-for-sh
@@ -1176,7 +1174,7 @@ of the terminal-emulator"
   (setq mode-name "terminal")
 ; (make-local-variable 'Helper-return-blurb)
 ; (setq Helper-return-blurb "return to terminal simulator")
-  (setq mode-line-process '(": %s"))
+  (setq mode-line-process '(":%s"))
   (setq buffer-read-only t)
   (setq truncate-lines t)
   (make-local-variable 'terminal-escape-char)