comparison lisp/term.el @ 36763:00b03757e45b

These changes are based on a patch sent from Yong Lu <[e-mail]>. (term-set-escape-char): Bind M-x to execute-extended-command in term-raw-escape-map. (term-move-columns): Don't try to move to negagive column. (term-emulate-terminal): Insert a string before deleting a text to overwrite.

36762:39edfdf3170b

;; 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 <[e-mail]>.

;;; To see what I've modified and where it came from search for '-mm'

    (lookup-key (current-global-map) "\C-u"))
  (define-key term-raw-escape-map c 'term-send-raw)
  (define-key term-raw-escape-map "\C-q" 'term-pager-toggle)
  ;; The keybinding for term-char-mode is needed by the menubar code.
  (define-key term-raw-escape-map "\C-k" 'term-char-mode)
  (define-key term-raw-escape-map "\C-j" 'term-line-mode))

(defun term-char-mode ()
  "Switch to char (\"raw\") sub-mode of term mode.
Each character you type is sent directly to the inferior without
intervention from Emacs, except for the escape character (usually C-c)."

;;; Same as (current-column), but uses term-current-column as a cache.
(defun term-current-column ()
  (cond (term-current-column)
	((setq term-current-column (current-column)))))

;;; Move DELTA column right (or left if delta < 0).

(defun term-move-columns (delta)
  (setq term-current-column (+ (term-current-column) delta))
  (move-to-column term-current-column t))

;; Insert COUNT copies of CHAR in the default face.
(defun term-insert-char (char count)
  (let ((old-point (point)))

				  (t ;; Doing PAGER processing.
				   (setq count 0 funny i)
				   (setq term-current-column nil)
				   (setq term-start-line-column nil)))
			    (setq old-point (point))
			    ;; In the common case that we're at the end of
			    ;; the buffer, we can save a little work.
			    (cond ((/= (point) (point-max))
				   (if term-insert-mode
				       ;; Inserting spaces, then deleting them,
				       ;; then inserting the actual text is
				       ;; inefficient, but it is simple, and
				       ;; the actual overhead is miniscule.
				       (term-insert-spaces count))
				   (term-move-columns count)
				   (delete-region old-point (point)))
	(t (setq term-current-column (+ (term-current-column) count))))
			    (insert (substring str i funny))
			    (put-text-property old-point (point)
					       'face term-current-face)
			    ;; If the last char was written in last column,
			    ;; back up one column, but remember we did so.
			    ;; Thus we emulate xterm/vt100-style line-wrapping.

36763:00b03757e45b

;; 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.

;;; Marck 13 2001
;;; Fixes for CJK support by Yong Lu <[e-mail]>.

;;; Dir/Hostname tracking and ANSI colorization by
;;; Marco Melgazzi <[e-mail]>.

;;; To see what I've modified and where it came from search for '-mm'

    (lookup-key (current-global-map) "\C-u"))
  (define-key term-raw-escape-map c 'term-send-raw)
  (define-key term-raw-escape-map "\C-q" 'term-pager-toggle)
  ;; The keybinding for term-char-mode is needed by the menubar code.
  (define-key term-raw-escape-map "\C-k" 'term-char-mode)
  (define-key term-raw-escape-map "\C-j" 'term-line-mode)
  ;; It's convenient to have execute-extended-command here.
  (define-key term-raw-escape-map [?\M-x] 'execute-extended-command))

(defun term-char-mode ()
  "Switch to char (\"raw\") sub-mode of term mode.
Each character you type is sent directly to the inferior without
intervention from Emacs, except for the escape character (usually C-c)."

;;; Same as (current-column), but uses term-current-column as a cache.
(defun term-current-column ()
  (cond (term-current-column)
	((setq term-current-column (current-column)))))

;;; Move DELTA column right (or left if delta < 0 limiting at column 0).

(defun term-move-columns (delta)
  (setq term-current-column (max 0 (+ (term-current-column) delta)))
  (move-to-column term-current-column t))

;; Insert COUNT copies of CHAR in the default face.
(defun term-insert-char (char count)
  (let ((old-point (point)))

				  (t ;; Doing PAGER processing.
				   (setq count 0 funny i)
				   (setq term-current-column nil)
				   (setq term-start-line-column nil)))
			    (setq old-point (point))

			    ;; Insert a string, check how many columns
			    ;; we moved, then delete that many columns
			    ;; following point if not eob nor insert-mode.
			    (let ((old-column (current-column))
				  columns pos)
			      (insert (substring str i funny))
			      (setq term-current-column (current-column)
				    columns (- term-current-column old-column))
			      (when (not (or (eobp) term-insert-mode))
				(setq pos (point))
				(term-move-columns columns)
				(delete-region pos (point))))
			    (setq term-current-column nil)
							 
			    (put-text-property old-point (point)
					       'face term-current-face)
			    ;; If the last char was written in last column,
			    ;; back up one column, but remember we did so.
			    ;; Thus we emulate xterm/vt100-style line-wrapping.