Mercurial > emacs

changeset 30731:4ce2b3d23348

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(comint-highlight-prompt, comint-highlight-prompt-face) (comint-last-prompt-overlay): New variables. (comint-output-filter): Implement prompt highlighting. (comint-snapshot-last-prompt): New function. (comint-send-input): Snapshot the last prompt. Use comint-highlight-input-face. (comint-highlight-input-face): Renamed from `comint-highlight-face'. Use defface instead of defcustom. (send-invisible, comint-send-eof): Snapshot the last prompt. (comint-delchar-or-maybe-eof): Use comint-send-eof. (comint-mode): Make `comint-last-prompt-overlay' buffer-local.
author Miles Bader <miles@gnu.org>
date Thu, 10 Aug 2000 10:34:14 +0000
parents 460a4e222f17
children 1f8280a188f2
files lisp/comint.el
diffstat 1 files changed, 52 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/comint.el	Thu Aug 10 10:14:15 2000 +0000
+++ b/lisp/comint.el	Thu Aug 10 10:34:14 2000 +0000
@@ -211,9 +211,20 @@
   :type 'boolean
   :group 'comint)
 
-(defcustom comint-highlight-face 'bold
-  "*Face to use to highlight input when `comint-highlight-input' is non-nil."
-  :type 'face
+(defface comint-highlight-input-face '((t (:bold t)))
+  "Face to use to highlight input when `comint-highlight-input' is non-nil."
+  :group 'comint)
+
+(defcustom comint-highlight-prompt t
+  "*If non-nil, highlight program prompts.
+See also `comint-highlight-face'."
+  :type 'boolean
+  :group 'comint)
+
+(defface comint-highlight-prompt-face
+  '((((background dark)) (:foreground "cyan"))
+    (t (:foreground "dark blue")))
+  "Face to use to highlight prompt when `comint-highlight-prompt' is non-nil."
   :group 'comint)
 
 (defcustom comint-input-ignoredups nil
@@ -480,6 +491,7 @@
   (make-local-variable 'comint-last-output-start)
   (setq comint-last-output-start (make-marker))
   (make-local-variable 'comint-last-output-overlay)
+  (make-local-variable 'comint-last-prompt-overlay)
   (make-local-variable 'comint-prompt-regexp)        ; Don't set; default
   (make-local-variable 'comint-input-ring-size)      ; ...to global val.
   (make-local-variable 'comint-input-ring)
@@ -1411,7 +1423,7 @@
 		  (overlay-put over 'field 'input)
 		  (overlay-put over 'front-sticky t))
 		(when comint-highlight-input
-		  (overlay-put over 'face comint-highlight-face)
+		  (overlay-put over 'face 'comint-highlight-input-face)
 		  (overlay-put over 'mouse-face 'highlight)
 		  (overlay-put over 'evaporate t))))
 	    (unless comint-use-prompt-regexp-instead-of-fields
@@ -1420,6 +1432,8 @@
 		(overlay-put over 'field 'boundary)
 		(overlay-put over 'evaporate t))))
 
+	  (comint-snapshot-last-prompt)
+
 	  (setq comint-save-input-ring-index comint-input-ring-index)
 	  (setq comint-input-ring-index nil)
 	  ;; Update the markers before we send the input
@@ -1453,6 +1467,17 @@
 ;; multiple contiguous overlays for multiple contiguous output chunks.
 (defvar comint-last-output-overlay nil)
 
+;; When non-nil, this is an overlay over the last recognized prompt in
+;; the buffer; it is used when highlighting the prompt.
+(defvar comint-last-prompt-overlay nil)
+
+;; `snapshot' any current comint-last-prompt-overlay, freezing it in place.
+;; Any further output will then create a new comint-last-prompt-overlay.
+(defun comint-snapshot-last-prompt ()
+  (when comint-last-prompt-overlay
+    (overlay-put comint-last-prompt-overlay 'evaporate t)
+    (setq comint-last-prompt-overlay nil)))
+
 ;; The purpose of using this filter for comint processes
 ;; is to keep comint-last-input-end from moving forward
 ;; when output is inserted.
@@ -1500,6 +1525,26 @@
 		  (overlay-put over 'evaporate t)
 		  (setq comint-last-output-overlay over))))
 
+	    (when comint-highlight-prompt
+	      ;; Highlight the prompt, where we define `prompt' to mean
+	      ;; the most recent output that doesn't end with a newline.
+	      (unless (and (bolp) (null comint-last-prompt-overlay))
+		;; Need to create or move the prompt overlay (in the
+		;; case where's no prompt ((bolp) == t), we still do
+		;; this if there's already an existing overlay.
+		(let ((prompt-start (save-excursion (forward-line 0) (point))))
+		  (if comint-last-prompt-overlay
+		      ;; Just move an existing overlay
+		      (move-overlay comint-last-prompt-overlay
+				    prompt-start (point))
+		    ;; Need to create the overlay
+		    (setq comint-last-prompt-overlay
+			  (make-overlay prompt-start (point)))
+		    (overlay-put comint-last-prompt-overlay
+				 'rear-nonsticky t)
+		    (overlay-put comint-last-prompt-overlay
+				 'face 'comint-highlight-prompt-face)))))
+
 	    ;; Don't insert initial prompt outside the top of the window.
 	    (if (= (window-start (selected-window)) (point))
 		(set-window-start (selected-window) (- (point) (length string))))
@@ -1763,6 +1808,7 @@
     (cond ((not proc)
 	   (error "Current buffer has no process"))
 	  ((stringp str)
+	   (comint-snapshot-last-prompt)
 	   (funcall comint-input-sender proc str))
 	  (t
 	   (let ((str (comint-read-noecho "Non-echoed text: " t)))
@@ -1877,12 +1923,13 @@
   (interactive "p")
   (let ((proc (get-buffer-process (current-buffer))))
     (if (and (eobp) proc (= (point) (marker-position (process-mark proc))))
-	(process-send-eof)
+	(comint-send-eof)
       (delete-char arg))))
 
 (defun comint-send-eof ()
   "Send an EOF to the current buffer's process."
   (interactive)
+  (comint-snapshot-last-prompt)
   (process-send-eof))