Merge from emacs--rel--22

[gnu-emacs] / lisp / terminal.el

diff --git a/lisp/terminal.el b/lisp/terminal.el
index b84b1b6ed00fab75d3c5d316c3ba7ed4b8d54a43..e584cc4a24331ff77e6a97b0623edca4cee4d324 100644 (file)
--- a/lisp/terminal.el
+++ b/lisp/terminal.el
@@ -1,6 +1,7 @@
 ;;; terminal.el --- terminal emulator for GNU Emacs
 
-;; Copyright (C) 1986,87,88,89,93,94 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1987, 1988, 1989, 1993, 1994, 2001, 2002, 2003,
+;;   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Richard Mlynarik <mly@eddie.mit.edu>
 ;; Maintainer: FSF
@@ -8,10 +9,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; 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)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -537,7 +536,7 @@ together with a command \\<terminal-edit-map>to return to terminal emulation: \\
   (setq mode-name "Terminal Edit")
   (setq mode-line-modified (default-value 'mode-line-modified))
   (setq mode-line-process nil)
-  (run-hooks 'terminal-edit-mode-hook))
+  (run-mode-hooks 'terminal-edit-mode-hook))
 
 (defun te-edit ()
   "Start editing the terminal emulator buffer with ordinary Emacs commands."
@@ -566,10 +565,10 @@ together with a command \\<terminal-edit-map>to return to terminal emulation: \\
         (let ((p (point)))
           (cond ((search-forward "\n" (+ p width) 'move)
                  (forward-char -1)
-                 (insert-char ?\  (- width (- (point) p)))
+                 (insert-char ?\s (- width (- (point) p)))
                  (forward-char 1))
                 ((eobp)
-                 (insert-char ?\  (- width (- (point) p))))
+                 (insert-char ?\s (- width (- (point) p))))
                 ((= (following-char) ?\n)
                  (forward-char 1))
                 (t
@@ -641,7 +640,7 @@ together with a command \\<terminal-edit-map>to return to terminal emulation: \\
           (forward-char 1)
           (delete-region (point)
                          (+ (point) (length terminal-more-break-insertion)))
-          (insert-char ?\  te-width)
+          (insert-char ?\s te-width)
           (goto-char te-more-old-point)))
     (setq te-more-old-point nil)
     (let ((te-more-count 259259))
@@ -692,7 +691,7 @@ move to start of new line, clear to end of line."
                   (insert ?\n))))
     (forward-char 1)
     (delete-region (point) (+ (point) te-width)))
-  (insert-char ?\  te-width)
+  (insert-char ?\s te-width)
   (beginning-of-line)
   (te-set-window-start))
 
@@ -716,7 +715,7 @@ move to start of new line, clear to end of line."
   (save-excursion
     (let ((n (- (point) (progn (end-of-line) (point)))))
       (delete-region (point) (+ (point) n))
-      (insert-char ?\  (- n)))))
+      (insert-char ?\s (- n)))))
 
 
 ;; ^p C
@@ -726,7 +725,7 @@ move to start of new line, clear to end of line."
     (while (progn (end-of-line) (not (eobp)))
       (forward-char 1) (end-of-line)
       (delete-region (- (point) te-width) (point))
-      (insert-char ?\  te-width))))
+      (insert-char ?\s te-width))))
 
 
 ;; ^p ^l
@@ -736,7 +735,7 @@ move to start of new line, clear to end of line."
   (let ((i 0))
     (while (< i te-height)
       (setq i (1+ i))
-      (insert-char ?\  te-width)
+      (insert-char ?\s te-width)
       (insert ?\n)))
   (delete-region (1- (point-max)) (point-max))
   (goto-char (point-min))
@@ -749,13 +748,13 @@ move to start of new line, clear to end of line."
       ();(error "fooI")
     (save-excursion
       (let* ((line (- te-height (/ (- (point) (point-min)) (1+ te-width)) -1))
-            (n (min (- (te-get-char) ?\ ) line))
+            (n (min (- (te-get-char) ?\s) line))
             (i 0))
        (delete-region (- (point-max) (* n (1+ te-width))) (point-max))
        (if (eq (point) (point-max)) (insert ?\n))
        (while (< i n)
          (setq i (1+ i))
-         (insert-char ?\  te-width)
+         (insert-char ?\s te-width)
          (or (eq i line) (insert ?\n))))))
   (setq te-more-count -1))
 
@@ -765,7 +764,7 @@ move to start of new line, clear to end of line."
   (if (not (bolp))
       ();(error "fooD")
     (let* ((line (- te-height (/ (- (point) (point-min)) (1+ te-width)) -1))
-          (n (min (- (te-get-char) ?\ ) line))
+          (n (min (- (te-get-char) ?\s) line))
           (i 0))
       (delete-region (point)
                     (min (+ (point) (* n (1+ te-width))) (point-max)))
@@ -773,7 +772,7 @@ move to start of new line, clear to end of line."
        (goto-char (point-max))
        (while (< i n)
          (setq i (1+ i))
-         (insert-char ?\  te-width)
+         (insert-char ?\s te-width)
          (or (eq i line) (insert ?\n))))))
   (setq te-more-count -1))
 
@@ -797,7 +796,7 @@ move to start of new line, clear to end of line."
   (if (bolp)
       ()
     (delete-region (1- (point)) (point))
-    (insert ?\ )
+    (insert ?\s)
     (forward-char -1)))
 
 ;; ^p ^g
@@ -814,7 +813,7 @@ move to start of new line, clear to end of line."
        nil
       (delete-char (- n))
       (goto-char p)
-      (insert-char ?\  n))
+      (insert-char ?\s n))
     (goto-char p)))
 
 ;; ^p d count+32  (should be ^p ^d but cretinous un*x won't send ^d chars!!!)
@@ -824,7 +823,7 @@ move to start of new line, clear to end of line."
                 (- (progn (end-of-line) (point)) p))))
     (if (<= n 0)
        nil
-      (insert-char ?\  n)
+      (insert-char ?\s n)
       (goto-char p)
       (delete-char n))
     (goto-char p)))
@@ -861,7 +860,7 @@ move to start of new line, clear to end of line."
          (delete-char 1)
          (goto-char (point-max))
          (insert ?\n)
-         (insert-char ?\  te-width)
+         (insert-char ?\s te-width)
          (beginning-of-line))
       (forward-line 1))
     (move-to-column column))
@@ -1089,7 +1088,7 @@ This escape character may be changed using the variable `terminal-escape-char'.
 
 `Meta' characters may not currently be sent through the terminal emulator.
 
-Here is a list of some of the variables which control the behaviour
+Here is a list of some of the variables which control the behavior
 of the emulator -- see their documentation for more information:
 terminal-escape-char, terminal-scrolling, terminal-more-processing,
 terminal-redisplay-interval.
@@ -1114,7 +1113,7 @@ subprocess started."
                         (getenv "SHELL")
                         "/bin/sh"))
                   (s (read-string
-                      (format "Run program in emulator: (default %s) "
+                      (format "Run program in emulator (default %s): "
                               default-s))))
              (if (equal s "")
                  (list default-s '())
@@ -1161,7 +1160,7 @@ subprocess started."
   (setq inhibit-quit t)                        ;sport death
   (use-local-map terminal-map)
   (run-hooks 'terminal-mode-hook)
-  (message "Entering emacs terminal-emulator...  Type %s %s for help"
+  (message "Entering Emacs terminal-emulator...  Type %s %s for help"
           (single-key-description terminal-escape-char)
           (mapconcat 'single-key-description
                      (where-is-internal 'te-escape-help terminal-escape-map t)
@@ -1345,5 +1344,5 @@ in the directory specified by `te-terminfo-directory'."
 
 (provide 'terminal)
 
-;;; arch-tag: 0ae1d7d7-90ef-4566-a531-6e7ff8c79b2f
+;; arch-tag: 0ae1d7d7-90ef-4566-a531-6e7ff8c79b2f
 ;;; terminal.el ends here