[Emacs-diffs] Changes to emacs/lisp/comint.el

[Richard M. Stallman]

Index: emacs/lisp/comint.el
diff -c emacs/lisp/comint.el:1.275 emacs/lisp/comint.el:1.276
*** emacs/lisp/comint.el:1.275  Fri Jun 14 05:41:20 2002
--- emacs/lisp/comint.el        Sat Jun 15 10:26:06 2002
***************
*** 2059,2065 ****
  This command also kills the pending input
  between the process-mark and point."
    (interactive)
!   (comint-kill-input)
    (interrupt-process nil comint-ptyp))
  
  (defun comint-kill-subjob ()
--- 2059,2065 ----
  This command also kills the pending input
  between the process-mark and point."
    (interactive)
!   (comint-skip-input)
    (interrupt-process nil comint-ptyp))
  
  (defun comint-kill-subjob ()
***************
*** 2067,2073 ****
  This command also kills the pending input
  between the process-mark and point."
    (interactive)
!   (comint-kill-input)
    (kill-process nil comint-ptyp))
  
  (defun comint-quit-subjob ()
--- 2067,2073 ----
  This command also kills the pending input
  between the process-mark and point."
    (interactive)
!   (comint-skip-input)
    (kill-process nil comint-ptyp))
  
  (defun comint-quit-subjob ()
***************
*** 2075,2081 ****
  This command also kills the pending input
  between the process-mark and point."
    (interactive)
!   (comint-kill-input)
    (quit-process nil comint-ptyp))
  
  (defun comint-stop-subjob ()
--- 2075,2081 ----
  This command also kills the pending input
  between the process-mark and point."
    (interactive)
!   (comint-skip-input)
    (quit-process nil comint-ptyp))
  
  (defun comint-stop-subjob ()
***************
*** 2088,2094 ****
  this, use \\[comint-continue-subjob] to resume the process. (This
  is not a problem with most shells, since they ignore this signal.)"
    (interactive)
!   (comint-kill-input)
    (stop-process nil comint-ptyp))
  
  (defun comint-continue-subjob ()
--- 2088,2094 ----
  this, use \\[comint-continue-subjob] to resume the process. (This
  is not a problem with most shells, since they ignore this signal.)"
    (interactive)
!   (comint-skip-input)
    (stop-process nil comint-ptyp))
  
  (defun comint-continue-subjob ()
***************
*** 2096,2101 ****
--- 2096,2114 ----
  Useful if you accidentally suspend the top-level process."
    (interactive)
    (continue-process nil comint-ptyp))
+ 
+ (defun comint-skip-input ()
+   "Skip all pending input, from last stuff output by interpreter to point.
+ This means mark it as if it had been sent as input, without sending it."
+   (let ((comint-input-sender 'ignore)
+       (comint-input-filter-functions nil))
+     (comint-send-input t))
+   (end-of-line)
+   (let ((pos (point))
+       (marker (process-mark (get-buffer-process (current-buffer)))))
+     (insert "  " (key-description (this-command-keys)))
+     (if (= marker pos)
+       (set-marker marker (point)))))
  
  (defun comint-kill-input ()
    "Kill all text from last stuff output by interpreter to point."