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

[Richard M . Stallman]

Index: emacs/lisp/comint.el
diff -c emacs/lisp/comint.el:1.314 emacs/lisp/comint.el:1.315
*** emacs/lisp/comint.el:1.314  Fri Apr  8 23:45:09 2005
--- emacs/lisp/comint.el        Sun Apr 10 23:26:57 2005
***************
*** 1388,1401 ****
                                  cmd))))
        (ring-insert comint-input-ring cmd)))
  
! (defun comint-send-input (&optional no-newline)
    "Send input to process.
  After the process output mark, sends all text from the process mark to
  point as input to the process.  Before the process output mark, calls
  value of variable `comint-get-old-input' to retrieve old input, copies
! it to the process mark, and sends it.  A terminal newline is also
! inserted into the buffer and sent to the process unless NO-NEWLINE is
! non-nil.
  
  Any history reference may be expanded depending on the value of the variable
  `comint-input-autoexpand'.  The list of function names contained in the value
--- 1388,1402 ----
                                  cmd))))
        (ring-insert comint-input-ring cmd)))
  
! (defun comint-send-input (&optional no-newline artificial)
    "Send input to process.
  After the process output mark, sends all text from the process mark to
  point as input to the process.  Before the process output mark, calls
  value of variable `comint-get-old-input' to retrieve old input, copies
! it to the process mark, and sends it.
! 
! This command also sends and inserts a final newline, unless
! NO-NEWLINE is non-nil.
  
  Any history reference may be expanded depending on the value of the variable
  `comint-input-autoexpand'.  The list of function names contained in the value
***************
*** 1409,1414 ****
--- 1410,1417 ----
  After the input has been sent, if `comint-process-echoes' is non-nil,
  then `comint-send-input' waits to see if the process outputs a string
  matching the input, and if so, deletes that part of the output.
+ If ARTIFICIAL is non-nil, it inhibits such deletion.
+ Callers sending input not from the user should use ARTIFICIAL = t.
  
  The values of `comint-get-old-input', `comint-input-filter-functions', and
  `comint-input-filter' are chosen according to the command interpreter running
***************
*** 1513,1519 ****
            (funcall comint-input-sender proc input))
  
          ;; Optionally delete echoed input (after checking it).
!         (when comint-process-echoes
            (let ((echo-len (- comint-last-input-end
                               comint-last-input-start)))
              ;; Wait for all input to be echoed:
--- 1516,1522 ----
            (funcall comint-input-sender proc input))
  
          ;; Optionally delete echoed input (after checking it).
!         (when (and comint-process-echoes (not artificial))
            (let ((echo-len (- comint-last-input-end
                               comint-last-input-start)))
              ;; Wait for all input to be echoed:
***************
*** 2088,2094 ****
  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)))))
--- 2091,2097 ----
  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 t))
    (end-of-line)
    (let ((pos (point))
        (marker (process-mark (get-buffer-process (current-buffer)))))
***************
*** 2115,2121 ****
  (defun comint-send-eof ()
    "Send an EOF to the current buffer's process."
    (interactive)
!   (comint-send-input t)
    (process-send-eof))
  
  
--- 2118,2124 ----
  (defun comint-send-eof ()
    "Send an EOF to the current buffer's process."
    (interactive)
!   (comint-send-input t t)
    (process-send-eof))