emacs: lisp/term.el comparison

comparison lisp/term.el @ 83652:5b644ae74c91

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 846-851) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 88-92) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 242-244) - Update from CVS Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-31

author	Miles Bader <miles@gnu.org>
date	Mon, 13 Aug 2007 13:51:08 +0000
parents	e5a68f18fcb9
children	107ccd98fa12 424b655804ca

comparison

equal deleted inserted replaced

-:47230f3f349b
+:5b644ae74c91
 (require 'ring)
 (require 'ehelp)
 (defgroup term nil
 "General command interpreter in a window."
-:group 'processes
+:group 'processes)
-:group 'unix)
 ;;; Buffer Local Variables:
 ;;;============================================================================
 ;;; Term mode buffer local variables:
 (defvar term-command-hook)
 (defvar term-log-buffer nil)
 (defvar term-scroll-with-delete nil) ;; term-scroll-with-delete is t if
 ;;		forward scrolling should be implemented by delete to
 ;;		top-most line(s); and nil if scrolling should be implemented
-;;		by moving term-home-marker.  It is set to t iff there is a
+;;		by moving term-home-marker.  It is set to t if there is a
 ;;		(non-default) scroll-region OR the alternate buffer is used.
 (defvar term-pending-delete-marker) ;; New user input in line mode needs to
 ;;		be deleted, because it gets echoed by the inferior.
 ;;		To reduce flicker, we defer the delete until the next output.
 (defvar term-old-mode-map nil) ;; Saves the old keymap when in char mode.
 (defvar term-terminal-previous-parameter-4 -1)
 ;;;
 ;;; faces -mm
-(defcustom term-default-fg-color 'unspecified
+(defcustom term-default-fg-color (face-foreground term-current-face)
 "Default color for foreground in `term'."
 :group 'term
 :type 'string)
-(defcustom term-default-bg-color 'unspecified
+(defcustom term-default-bg-color (face-background term-current-face)
 "Default color for background in `term'."
 :group 'term
 :type 'string)
 ;;; Use the same colors that xterm uses, see `xterm-standard-colors'.
 (make-local-variable 'term-exec-hook)
 (make-local-variable 'term-vertical-motion)
 (make-local-variable 'term-pending-delete-marker)
 (setq term-pending-delete-marker (make-marker))
 (make-local-variable 'term-current-face)
+(setq term-current-face (list :background term-default-bg-color
+				:foreground term-default-fg-color))
 (make-local-variable 'term-pending-frame)
 (setq term-pending-frame nil)
 ;; Cua-mode's keybindings interfere with the term keybindings, disable it.
 (set (make-local-variable 'cua-mode) nil)
 (run-mode-hooks 'term-mode-hook)
 (setq term-current-row 0)
 (setq term-current-column 1)
 (setq term-scroll-start 0)
 (setq term-scroll-end term-height)
 (setq term-insert-mode nil)
-(setq term-current-face nil)
+(setq term-current-face (list :background term-default-bg-color
+				:foreground term-default-fg-color))
 (setq term-ansi-current-underline nil)
 (setq term-ansi-current-bold nil)
 (setq term-ansi-current-reverse nil)
 (setq term-ansi-current-color 0)
 (setq term-ansi-current-invisible nil)
 ((eq parameter 49)
 (setq term-ansi-current-bg-color 0))
 ;;; 0 (Reset) or unknown (reset anyway)
 (t
-(setq term-current-face nil)
+(setq term-current-face (list :background term-default-bg-color
+				  :foreground term-default-fg-color))
 (setq term-ansi-current-underline nil)
 (setq term-ansi-current-bold nil)
 (setq term-ansi-current-reverse nil)
 (setq term-ansi-current-color 0)
 (setq term-ansi-current-invisible nil)
 		    ;; No need to bother with anything else if it's invisible
 		    )
 	    (setq term-current-face
 		  (list :background
 			(if (= term-ansi-current-color 0)
-			    (face-foreground 'default)
+			    term-default-fg-color
 			  (elt ansi-term-color-vector term-ansi-current-color))
 			:foreground
 			(if (= term-ansi-current-bg-color 0)
-			    (face-background 'default)
+			    term-default-bg-color
 			  (elt ansi-term-color-vector term-ansi-current-bg-color))))
 	    (when term-ansi-current-bold
 	      (setq term-current-face
 		    (append '(:weight bold) term-current-face)))
 	    (when term-ansi-current-underline
 			  (elt ansi-term-color-vector term-ansi-current-bg-color)))
 		  ;; No need to bother with anything else if it's invisible
 		  )
 	  (setq term-current-face
 		(list :foreground
-		      (elt ansi-term-color-vector term-ansi-current-color)
+		      (if (= term-ansi-current-color 0)
+			  term-default-fg-color
+			(elt ansi-term-color-vector term-ansi-current-color))
 		      :background
-		      (elt ansi-term-color-vector term-ansi-current-bg-color)))
+		      (if (= term-ansi-current-bg-color 0)
+			  term-default-bg-color
+			(elt ansi-term-color-vector term-ansi-current-bg-color))))
 	  (when term-ansi-current-bold
 	    (setq term-current-face
 		  (append '(:weight bold) term-current-face)))
 	  (when term-ansi-current-underline
 	    (setq term-current-face
 (goto-char saved-point))))
 (defun term-erase-in-display (kind)
 "Erases (that is blanks out) part of the window.
 If KIND is 0, erase from (point) to (point-max);
-if KIND is 1, erase from home to point; else erase from home to point-max.
+if KIND is 1, erase from home to point; else erase from home to point-max."
-Should only be called when point is at the start of a screen line."
 (term-handle-deferred-scroll)
 (cond ((eq term-terminal-parameter 0)
-	 (delete-region (point) (point-max))
+	 (let ((need-unwrap (bolp)))
-	 (term-unwrap-line))
+	   (delete-region (point) (point-max))
+	   (when need-unwrap (term-unwrap-line))))
 	((let ((row (term-current-row))
 	      (col (term-horizontal-column))
 	      (start-region term-home-marker)
 	      (end-region (if (eq kind 1) (point) (point-max))))
 	   (delete-region start-region end-region)

Mercurial > emacs

comparison lisp/term.el @ 83652:5b644ae74c91