X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/39f9c42439c4e146b3d35e7a864802535ab2d117..0b64a3da3a1673936bb61a5a9faa103640c66cf9:/lisp/term.el

diff --git a/lisp/term.el b/lisp/term.el
index e3aefb83b9..e8e584d215 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -6,6 +6,23 @@
 ;;; Based on comint mode written by: Olin Shivers <shivers@cs.cmu.edu>
 ;;; Keyword: processes
 
+;; 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)
+;; 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
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; 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.
+
 ;;; Dir/Hostname tracking and ANSI colorization by
 ;;; Marco Melgazzi <marco@techie.com>.
 
@@ -480,7 +497,7 @@ surrounding them, and also be regarded as arguments in their own right (unlike
 whitespace).  See `term-arguments'.
 Defaults to the empty list.
 
-For shells, a good value is (?\\| ?& ?< ?> ?\\( ?\\) ?;).
+For shells, a good value is (?\\| ?& ?< ?> ?\\( ?\\) ?\\;).
 
 This is a good thing to set in mode hooks.")
 
@@ -1223,8 +1240,8 @@ without any interpretation."
 (defun term-send-down  () (interactive) (term-send-raw-string "\eOB"))
 (defun term-send-right () (interactive) (term-send-raw-string "\eOC"))
 (defun term-send-left  () (interactive) (term-send-raw-string "\eOD"))
-(defun term-send-home  () (interactive) (term-send-raw-string "\e[H"))
-(defun term-send-end   () (interactive) (term-send-raw-string "\eOw"))
+(defun term-send-home  () (interactive) (term-send-raw-string "\e[1~"))
+(defun term-send-end   () (interactive) (term-send-raw-string "\e[4~"))
 (defun term-send-prior () (interactive) (term-send-raw-string "\e[5~"))
 (defun term-send-next  () (interactive) (term-send-raw-string "\e[6~"))
 (defun term-send-del   () (interactive) (term-send-raw-string "\C-?"))
@@ -1432,7 +1449,10 @@ buffer.  The hook term-exec-hook is run after each exec."
 	   (format "LINES=%d" term-height)
 	   (format "COLUMNS=%d" term-width))
 	  process-environment))
-	(process-connection-type t))
+	(process-connection-type t)
+	;; We should suppress conversion of end-of-line format.
+	(inhibit-eol-conversion t)
+	)
     (apply 'start-process name buffer
 	   "/bin/sh" "-c"
 	   (format "stty -nl echo rows %d columns %d sane 2>/dev/null;\
@@ -2680,6 +2700,7 @@ See `term-prompt-regexp'."
   (let* ((previous-buffer (current-buffer))
 	 (i 0) char funny count save-point save-marker old-point temp win
 	 (selected (selected-window))
+	 last-win
 	 (str-length (length str)))
     (unwind-protect
 	(progn
@@ -2874,7 +2895,7 @@ See `term-prompt-regexp'."
 		     (cond ((and (>= char ?0) (<= char ?9))
 			    (setq term-terminal-parameter
 				  (+ (* 10 term-terminal-parameter) (- char ?0))))
-			   ((eq char ?\073 ) ; ?;
+			   ((eq char ?\;)
 ;;; Some modifications to cope with multiple settings like ^[[01;32;43m -mm
 			    (setq term-terminal-more-parameters 1)
 			    (setq term-terminal-previous-parameter-4
@@ -2937,6 +2958,11 @@ See `term-prompt-regexp'."
 	  ;; Scroll each window displaying the buffer but (by default)
 	  ;; only if the point matches the process-mark we started with.
 	  (setq win selected)
+	  ;; Avoid infinite loop in strange case where minibuffer window
+	  ;; is selected but not active.
+	  (while (window-minibuffer-p win)
+	    (setq win (next-window win nil t)))
+	  (setq last-win win)
 	  (while (progn
 		   (setq win (next-window win nil t))
 		   (if (eq (window-buffer win) (process-buffer proc))
@@ -2962,7 +2988,7 @@ See `term-prompt-regexp'."
 			     (save-excursion
 			       (goto-char (point-max))
 			       (recenter -1)))))
-		   (not (eq win selected))))
+		   (not (eq win last-win))))
 
 ;;; Stolen from comint.el and adapted -mm
 	  (if (> term-buffer-maximum-size 0)
@@ -3014,12 +3040,22 @@ See `term-prompt-regexp'."
    ((eq parameter 8)
     (setq term-ansi-current-invisible 1))
 
+;;; Foreground
    ((and (>= parameter 30) (<= parameter 37))
     (setq term-ansi-current-color (- parameter 29)))
 
+;;; Reset foreground
+   ((eq parameter 39)
+    (setq term-ansi-current-color 0))
+
+;;; Background
    ((and (>= parameter 40) (<= parameter 47))
     (setq term-ansi-current-bg-color (- parameter 39)))
 
+;;; Reset background
+   ((eq parameter 49)
+    (setq term-ansi-current-bg-color 0))
+
 ;;; 0 (Reset) or unknown (reset anyway)
    (t
     (setq term-current-face