comparison lisp/term.el @ 83310:e58cb448e07c

Merged from [e-mail]--gnu-2005 (patch 80-82, 350-422) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-350 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-351 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-352 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-353 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-354 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-355 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-356 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-357 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-358 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-359 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-360 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-361 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-362 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-363 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-364 Remove "-face" suffix from widget faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-365 Remove "-face" suffix from custom faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-366 Remove "-face" suffix from change-log faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-367 Remove "-face" suffix from compilation faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-368 Remove "-face" suffix from diff-mode faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-369 lisp/longlines.el (longlines-visible-face): Face removed * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-370 Remove "-face" suffix from woman faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-371 Remove "-face" suffix from whitespace-highlight face * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-372 Remove "-face" suffix from ruler-mode faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-373 Remove "-face" suffix from show-paren faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-374 Remove "-face" suffix from log-view faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-375 Remove "-face" suffix from smerge faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-376 Remove "-face" suffix from show-tabs faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-377 Remove "-face" suffix from highlight-changes faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-378 Remove "-face" suffix from and downcase info faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-379 Remove "-face" suffix from pcvs faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-380 Update uses of renamed pcvs faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-381 Tweak ChangeLog * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-382 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-383 Remove "-face" suffix from strokes-char face * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-384 Remove "-face" suffix from compare-windows face * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-385 Remove "-face" suffix from calendar faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-386 Remove "-face" suffix from diary-button face * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-387 Remove "-face" suffix from testcover faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-388 Remove "-face" suffix from viper faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-389 Remove "-face" suffix from org faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-390 Remove "-face" suffix from sgml-namespace face * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-391 Remove "-face" suffix from table-cell face * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-392 Remove "-face" suffix from tex-mode faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-393 Remove "-face" suffix from texinfo-heading face * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-394 Remove "-face" suffix from flyspell faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-395 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-396 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-397 Remove "-face" suffix from gomoku faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-398 Remove "-face" suffix from mpuz faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-399 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-400 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-401 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-402 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-403 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-404 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-405 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-406 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-407 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-408 Remove "-face" suffix from Buffer-menu-buffer face * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-409 Remove "-face" suffix from antlr-mode faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-410 Remove "-face" suffix from ebrowse faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-411 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-412 Remove "-face" suffix from flymake faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-413 Remove "-face" suffix from idlwave faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-414 Remove "-face" suffix from sh-script faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-415 Remove "-face" suffix from vhdl-mode faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-416 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-417 Remove "-face" suffix from which-func face * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-418 Remove "-face" suffix from cperl-mode faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-419 Remove "-face" suffix from ld-script faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-420 Fix cperl-mode font-lock problem * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-421 Tweak which-func face * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-422 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-80 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-81 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-82 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-350

83309:6aee1e9b0bd7

(defvar term-input-sender (function term-simple-send)
  "Function to actually send to PROCESS the STRING submitted by user.
Usually this is just 'term-simple-send, but if your mode needs to
massage the input string, this is your hook.  This is called from
the user command term-send-input.  term-simple-send just sends
the string plus a newline.")

(defcustom term-eol-on-send t
  "*Non-nil means go to the end of the line before sending input.
See `term-send-input'."

       (esc-map (make-keymap))
       (i 0))
  (while (< i 128)
    (define-key map (make-string 1 i) 'term-send-raw)
    ;; Avoid O and [. They are used in escape sequences for various keys.
    (unless (or (eq i ?O) (eq i 91)) 
		(define-key esc-map (make-string 1 i) 'term-send-raw-meta))
    (setq i (1+ i)))
  (dolist (elm (generic-character-list))
    (define-key map (vector elm) 'term-send-raw))
  (define-key map "\e" esc-map)

(defvar term-display-table
  (let ((dt (or (copy-sequence standard-display-table)
		(make-display-table)))
        i)
    ;; avoid changing the display table for ^J
    (setq i 0) 
    (while (< i 10)
      (aset dt i (vector i))
      (setq i (1+ i)))
    (setq i 11) 
    (while (< i 32)
      (aset dt i (vector i))
      (setq i (1+ i)))
    (setq i 128)
    (while (< i 256)

and `term-scroll-to-bottom-on-output'.

If you accidentally suspend your process, use \\[term-continue-subjob]
to continue it.

This mode can be customised to create specific modes for running
particular subprocesses.  This can be done by setting the hooks
`term-input-filter-functions', `term-input-filter',
`term-input-sender' and `term-get-old-input' to appropriate functions,
and the variable `term-prompt-regexp' to the appropriate regular
expression.

  (force-mode-line-update))

(defun term-check-proc (buffer)
  "True if there is a process associated w/buffer BUFFER, and
it is alive (status RUN or STOP).  BUFFER can be either a buffer or the
name of one"
  (let ((proc (get-buffer-process buffer)))
    (and proc (memq (process-status proc) '(run stop)))))

;;;###autoload
(defun make-term (name program &optional startfile &rest switches)

    (<= proc-pos (point))))

(defun term-simple-send (proc string)
  "Default function for sending to PROC input STRING.
This just sends STRING plus a newline.  To override this,
set the hook TERM-INPUT-SENDER."
  (term-send-string proc string)
  (term-send-string proc "\n"))

(defun term-bol (arg)
  "Goes to the beginning of line, then skips past the prompt, if any.

(defvar term-input-chunk-size 512
  "*Long inputs send to term processes are broken up into chunks of this size.
If your process is choking on big inputs, try lowering the value.")

(defun term-send-string (proc str)
  "Send PROCESS the contents of STRING as input.
This is equivalent to process-send-string, except that long input strings
are broken up into chunks of size term-input-chunk-size.  Processes
are given a chance to output between chunks.  This can help prevent processes
from hanging when you send them long inputs on some OS's."
  (let* ((len (length str))

	(accept-process-output)
	(process-send-string proc (substring str i (min len next-i)))
	(setq i next-i)))))

(defun term-send-region (proc start end)
  "Sends to PROC the region delimited by START and END.
This is a replacement for process-send-region that tries to keep
your process from hanging on long inputs.  See term-send-string."
  (term-send-string proc (buffer-substring start end)))


;;; Random input hackage

;;;                                 '(lisp-mode) t))

;;; This is pretty stupid about strings.  It decides we're in a string
;;; if there's a quote on both sides of point on the current line.
(defun term-extract-string ()
  "Returns string around POINT that starts the current line or nil."
  (save-excursion
    (let* ((point (point))
	   (bol (progn (beginning-of-line) (point)))
	   (eol (progn (end-of-line) (point)))
	   (start (progn (goto-char point)

		   (narrow-to-region term-home-marker (point-max))
		   (- (term-vertical-motion -9999))))))))

(defun term-adjust-current-row-cache (delta)
  (when term-current-row
    (setq term-current-row 
	  (max 0 (+ term-current-row delta)))))

(defun term-terminal-pos ()
  (save-excursion ;    save-restriction
    (let ((save-col (term-current-column))

			      (term-move-columns columns)
			      (delete-region pos (point)))
			    ;; In insert if the if the current line
			    ;; has become too long it needs to be
			    ;; chopped off.
			    (when term-insert-mode 
			      (setq pos (point))
			      (end-of-line)
			      (when (> (current-column) term-width)
				(delete-region (- (point) (- (current-column) term-width)) 
					       (point)))
			      (goto-char pos)))
			  (setq term-current-column nil)

			  (put-text-property old-point (point)

			 ((and (setq term-terminal-state 0)
			       (eq char ?\^I)) ; TAB (terminfo: ht)
			  (setq count (term-current-column))
			  ;; The line cannot exceed term-width. TAB at
			  ;; the end of a line should not cause wrapping.
			  (setq count (min term-width 
					   (+ count 8 (- (mod count 8)))))
			  (if (> term-width count)
			    (progn
			      (term-move-columns 
			       (- count (term-current-column)))
			      (setq term-current-column count))
			    (when (> term-width (term-current-column))
			      (term-move-columns 
			       (1- (- term-width (term-current-column)))))
			    (when (= term-width (term-current-column))
			      (term-move-columns -1))))
			 ((eq char ?\r)
			  ;; Optimize CRLF at end of buffer:

			 ((eq char ?8) ;; Restore cursor (terminfo: rc)
			  (if term-saved-cursor
			      (term-goto (car term-saved-cursor)
					 (cdr term-saved-cursor)))
			  (setq term-terminal-state 0))
			 ((eq char ?c) ;; \Ec - Reset (terminfo: rs1) 
			  ;; This is used by the "clear" program.
			  (setq term-terminal-state 0)
			  (term-reset-terminal))
			 ;; The \E#8 reset sequence for xterm. We
			 ;; probably don't need to handle it, but this

	  (term-vertical-motion (1+ count))
	  (set-marker term-home-marker (point))
	  (setq term-current-row (1- term-height))))))

;;; Reset the terminal, delete all the content and set the face to the
;;; default one. 
(defun term-reset-terminal ()
  (erase-buffer)
  (setq term-current-row 0)
  (setq term-current-column 1)
  (setq term-insert-mode nil)

(defun term-handle-ansi-escape (proc char)
  (cond
   ((or (eq char ?H)  ; cursor motion (terminfo: cup)
	;; (eq char ?f) ; xterm seems to handle this sequence too, not
	;; needed for now
	) 
    (if (<= term-terminal-parameter 0)
	(setq term-terminal-parameter 1))
    (if (<= term-terminal-previous-parameter 0)
	(setq term-terminal-previous-parameter 1))
    (if (> term-terminal-previous-parameter term-height)

   ;; \E[B - cursor down (terminfo: cud)
   ((eq char ?B)
    (term-down (max 1 term-terminal-parameter) t))
   ;; \E[C - cursor right (terminfo: cuf)
   ((eq char ?C)
    (term-move-columns 
     (max 1 
	  (if (>= (+ term-terminal-parameter (term-current-column)) term-width)
	      (- term-width (term-current-column)  1)
	    term-terminal-parameter))))
   ;; \E[D - cursor left (terminfo: cub)
   ((eq char ?D)

	  ;; ((eq term-terminal-parameter 47) ;; (terminfo: rmcup)
	  ;; (term-switch-to-alternate-sub-buffer nil))
	  ))

;;; Modified to allow ansi coloring -mm
   ;; \E[m - Set/reset modes, set bg/fg 
   ;;(terminfo: smso,rmso,smul,rmul,rev,bold,sgr0,invis,op,setab,setaf)
   ((eq char ?m)
    (when (= term-terminal-more-parameters 1)
      (if (>= term-terminal-previous-parameter-4 0)
	  (term-handle-colors-array term-terminal-previous-parameter-4))

  (setq term-scroll-with-delete
	(or (term-using-alternate-sub-buffer)
	    (not (and (= term-scroll-start 0)
		      (= term-scroll-end term-height)))))
  (term-move-columns (- (term-current-column)))
  (term-goto 
   term-scroll-start (term-current-column)))

;; (defun term-switch-to-alternate-sub-buffer (set)
;;   ;; If asked to switch to (from) the alternate sub-buffer, and already (not)
;;   ;; using it, do nothing.  This test is needed for some programs (including

			(concat term-file-name-prefix directory)
		      directory)))


(defun term-word (word-chars)
  "Return the word of WORD-CHARS at point, or nil if non is found.
Word constituents are considered to be those in WORD-CHARS, which is like the
inside of a \"[...]\" (see `skip-chars-forward')."
  (save-excursion
    (let ((limit (point))
	  (word (concat "[" word-chars "]"))

	(re-search-forward (concat word "+") limit)
	(buffer-substring (match-beginning 0) (match-end 0))))))


(defun term-match-partial-filename ()
  "Return the filename at point, or nil if non is found.
Environment variables are substituted.  See `term-word'."
  (let ((filename (term-word "~/A-Za-z0-9+@:_.$#,={}-")))
    (and filename (substitute-in-file-name filename))))

83310:e58cb448e07c

(defvar term-input-sender (function term-simple-send)
  "Function to actually send to PROCESS the STRING submitted by user.
Usually this is just 'term-simple-send, but if your mode needs to
massage the input string, this is your hook.  This is called from
the user command term-send-input.  `term-simple-send' just sends
the string plus a newline.")

(defcustom term-eol-on-send t
  "*Non-nil means go to the end of the line before sending input.
See `term-send-input'."

       (esc-map (make-keymap))
       (i 0))
  (while (< i 128)
    (define-key map (make-string 1 i) 'term-send-raw)
    ;; Avoid O and [. They are used in escape sequences for various keys.
    (unless (or (eq i ?O) (eq i 91))
		(define-key esc-map (make-string 1 i) 'term-send-raw-meta))
    (setq i (1+ i)))
  (dolist (elm (generic-character-list))
    (define-key map (vector elm) 'term-send-raw))
  (define-key map "\e" esc-map)

(defvar term-display-table
  (let ((dt (or (copy-sequence standard-display-table)
		(make-display-table)))
        i)
    ;; avoid changing the display table for ^J
    (setq i 0)
    (while (< i 10)
      (aset dt i (vector i))
      (setq i (1+ i)))
    (setq i 11)
    (while (< i 32)
      (aset dt i (vector i))
      (setq i (1+ i)))
    (setq i 128)
    (while (< i 256)

and `term-scroll-to-bottom-on-output'.

If you accidentally suspend your process, use \\[term-continue-subjob]
to continue it.

This mode can be customized to create specific modes for running
particular subprocesses.  This can be done by setting the hooks
`term-input-filter-functions', `term-input-filter',
`term-input-sender' and `term-get-old-input' to appropriate functions,
and the variable `term-prompt-regexp' to the appropriate regular
expression.

  (force-mode-line-update))

(defun term-check-proc (buffer)
  "True if there is a process associated w/buffer BUFFER, and
it is alive (status RUN or STOP).  BUFFER can be either a buffer or the
name of one."
  (let ((proc (get-buffer-process buffer)))
    (and proc (memq (process-status proc) '(run stop)))))

;;;###autoload
(defun make-term (name program &optional startfile &rest switches)

    (<= proc-pos (point))))

(defun term-simple-send (proc string)
  "Default function for sending to PROC input STRING.
This just sends STRING plus a newline.  To override this,
set the hook `term-input-sender'."
  (term-send-string proc string)
  (term-send-string proc "\n"))

(defun term-bol (arg)
  "Goes to the beginning of line, then skips past the prompt, if any.

(defvar term-input-chunk-size 512
  "*Long inputs send to term processes are broken up into chunks of this size.
If your process is choking on big inputs, try lowering the value.")

(defun term-send-string (proc str)
  "Send to PROC the contents of STR as input.
This is equivalent to process-send-string, except that long input strings
are broken up into chunks of size term-input-chunk-size.  Processes
are given a chance to output between chunks.  This can help prevent processes
from hanging when you send them long inputs on some OS's."
  (let* ((len (length str))

	(accept-process-output)
	(process-send-string proc (substring str i (min len next-i)))
	(setq i next-i)))))

(defun term-send-region (proc start end)
  "Send to PROC the region delimited by START and END.
This is a replacement for process-send-region that tries to keep
your process from hanging on long inputs.  See `term-send-string'."
  (term-send-string proc (buffer-substring start end)))


;;; Random input hackage

;;;                                 '(lisp-mode) t))

;;; This is pretty stupid about strings.  It decides we're in a string
;;; if there's a quote on both sides of point on the current line.
(defun term-extract-string ()
  "Return string around `point' that starts the current line or nil."
  (save-excursion
    (let* ((point (point))
	   (bol (progn (beginning-of-line) (point)))
	   (eol (progn (end-of-line) (point)))
	   (start (progn (goto-char point)

		   (narrow-to-region term-home-marker (point-max))
		   (- (term-vertical-motion -9999))))))))

(defun term-adjust-current-row-cache (delta)
  (when term-current-row
    (setq term-current-row
	  (max 0 (+ term-current-row delta)))))

(defun term-terminal-pos ()
  (save-excursion ;    save-restriction
    (let ((save-col (term-current-column))

			      (term-move-columns columns)
			      (delete-region pos (point)))
			    ;; In insert if the if the current line
			    ;; has become too long it needs to be
			    ;; chopped off.
			    (when term-insert-mode
			      (setq pos (point))
			      (end-of-line)
			      (when (> (current-column) term-width)
				(delete-region (- (point) (- (current-column) term-width))
					       (point)))
			      (goto-char pos)))
			  (setq term-current-column nil)

			  (put-text-property old-point (point)

			 ((and (setq term-terminal-state 0)
			       (eq char ?\^I)) ; TAB (terminfo: ht)
			  (setq count (term-current-column))
			  ;; The line cannot exceed term-width. TAB at
			  ;; the end of a line should not cause wrapping.
			  (setq count (min term-width
					   (+ count 8 (- (mod count 8)))))
			  (if (> term-width count)
			    (progn
			      (term-move-columns
			       (- count (term-current-column)))
			      (setq term-current-column count))
			    (when (> term-width (term-current-column))
			      (term-move-columns
			       (1- (- term-width (term-current-column)))))
			    (when (= term-width (term-current-column))
			      (term-move-columns -1))))
			 ((eq char ?\r)
			  ;; Optimize CRLF at end of buffer:

			 ((eq char ?8) ;; Restore cursor (terminfo: rc)
			  (if term-saved-cursor
			      (term-goto (car term-saved-cursor)
					 (cdr term-saved-cursor)))
			  (setq term-terminal-state 0))
			 ((eq char ?c) ;; \Ec - Reset (terminfo: rs1)
			  ;; This is used by the "clear" program.
			  (setq term-terminal-state 0)
			  (term-reset-terminal))
			 ;; The \E#8 reset sequence for xterm. We
			 ;; probably don't need to handle it, but this

	  (term-vertical-motion (1+ count))
	  (set-marker term-home-marker (point))
	  (setq term-current-row (1- term-height))))))

;;; Reset the terminal, delete all the content and set the face to the
;;; default one.
(defun term-reset-terminal ()
  (erase-buffer)
  (setq term-current-row 0)
  (setq term-current-column 1)
  (setq term-insert-mode nil)

(defun term-handle-ansi-escape (proc char)
  (cond
   ((or (eq char ?H)  ; cursor motion (terminfo: cup)
	;; (eq char ?f) ; xterm seems to handle this sequence too, not
	;; needed for now
	)
    (if (<= term-terminal-parameter 0)
	(setq term-terminal-parameter 1))
    (if (<= term-terminal-previous-parameter 0)
	(setq term-terminal-previous-parameter 1))
    (if (> term-terminal-previous-parameter term-height)

   ;; \E[B - cursor down (terminfo: cud)
   ((eq char ?B)
    (term-down (max 1 term-terminal-parameter) t))
   ;; \E[C - cursor right (terminfo: cuf)
   ((eq char ?C)
    (term-move-columns
     (max 1
	  (if (>= (+ term-terminal-parameter (term-current-column)) term-width)
	      (- term-width (term-current-column)  1)
	    term-terminal-parameter))))
   ;; \E[D - cursor left (terminfo: cub)
   ((eq char ?D)

	  ;; ((eq term-terminal-parameter 47) ;; (terminfo: rmcup)
	  ;; (term-switch-to-alternate-sub-buffer nil))
	  ))

;;; Modified to allow ansi coloring -mm
   ;; \E[m - Set/reset modes, set bg/fg
   ;;(terminfo: smso,rmso,smul,rmul,rev,bold,sgr0,invis,op,setab,setaf)
   ((eq char ?m)
    (when (= term-terminal-more-parameters 1)
      (if (>= term-terminal-previous-parameter-4 0)
	  (term-handle-colors-array term-terminal-previous-parameter-4))

  (setq term-scroll-with-delete
	(or (term-using-alternate-sub-buffer)
	    (not (and (= term-scroll-start 0)
		      (= term-scroll-end term-height)))))
  (term-move-columns (- (term-current-column)))
  (term-goto
   term-scroll-start (term-current-column)))

;; (defun term-switch-to-alternate-sub-buffer (set)
;;   ;; If asked to switch to (from) the alternate sub-buffer, and already (not)
;;   ;; using it, do nothing.  This test is needed for some programs (including

			(concat term-file-name-prefix directory)
		      directory)))


(defun term-word (word-chars)
  "Return the word of WORD-CHARS at point, or nil if none is found.
Word constituents are considered to be those in WORD-CHARS, which is like the
inside of a \"[...]\" (see `skip-chars-forward')."
  (save-excursion
    (let ((limit (point))
	  (word (concat "[" word-chars "]"))

	(re-search-forward (concat word "+") limit)
	(buffer-substring (match-beginning 0) (match-end 0))))))


(defun term-match-partial-filename ()
  "Return the filename at point, or nil if none is found.
Environment variables are substituted.  See `term-word'."
  (let ((filename (term-word "~/A-Za-z0-9+@:_.$#,={}-")))
    (and filename (substitute-in-file-name filename))))