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

[Stefan Monnier]

Index: emacs/lisp/comint.el
diff -c emacs/lisp/comint.el:1.286 emacs/lisp/comint.el:1.287
*** emacs/lisp/comint.el:1.286  Fri Jan 31 10:13:59 2003
--- emacs/lisp/comint.el        Tue May 13 14:30:46 2003
***************
*** 1,6 ****
  ;;; comint.el --- general command interpreter in a window stuff
  
! ;; Copyright (C) 1988, 90, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002
  ;;    Free Software Foundation, Inc.
  
  ;; Author: Olin Shivers <address@hidden>
--- 1,6 ----
  ;;; comint.el --- general command interpreter in a window stuff
  
! ;; Copyright (C) 1988,90,92,93,94,95,96,97,98,99,2000,01,02,2003
  ;;    Free Software Foundation, Inc.
  
  ;; Author: Olin Shivers <address@hidden>
***************
*** 682,689 ****
  Blasts any old process running in the buffer.  Doesn't set the buffer mode.
  You can use this to cheaply run a series of processes in the same comint
  buffer.  The hook `comint-exec-hook' is run after each exec."
!   (save-excursion
!     (set-buffer buffer)
      (let ((proc (get-buffer-process buffer))) ; Blast any old process.
        (if proc (delete-process proc)))
      ;; Crank up a new process
--- 682,688 ----
  Blasts any old process running in the buffer.  Doesn't set the buffer mode.
  You can use this to cheaply run a series of processes in the same comint
  buffer.  The hook `comint-exec-hook' is run after each exec."
!   (with-current-buffer buffer
      (let ((proc (get-buffer-process buffer))) ; Blast any old process.
        (if proc (delete-process proc)))
      ;; Crank up a new process
***************
*** 1562,1568 ****
        (save-restriction
          (widen)
          (let ((inhibit-field-text-motion t)
!               (buffer-read-only nil))
            ;; CR LF -> LF
            ;; Note that this won't work properly when the CR and LF
            ;; are in different output chunks, but this is probably an
--- 1561,1567 ----
        (save-restriction
          (widen)
          (let ((inhibit-field-text-motion t)
!               (inhibit-read-only t))
            ;; CR LF -> LF
            ;; Note that this won't work properly when the CR and LF
            ;; are in different output chunks, but this is probably an
***************
*** 1601,1607 ****
            (setq functions (cdr functions))))
  
        ;; Insert STRING
!       (let ((buffer-read-only nil)
              ;; Avoid the overhead of save-excursion, since we just
              ;; fiddle with the point
              (saved-point (point-marker)))
--- 1600,1606 ----
            (setq functions (cdr functions))))
  
        ;; Insert STRING
!       (let ((inhibit-read-only t)
              ;; Avoid the overhead of save-excursion, since we just
              ;; fiddle with the point
              (saved-point (point-marker)))
***************
*** 1772,1778 ****
      (goto-char (process-mark (get-buffer-process (current-buffer))))
      (forward-line (- comint-buffer-maximum-size))
      (beginning-of-line)
!     (delete-region (point-min) (point))))
  
  (defun comint-strip-ctrl-m (&optional string)
    "Strip trailing `^M' characters from the current output group.
--- 1771,1778 ----
      (goto-char (process-mark (get-buffer-process (current-buffer))))
      (forward-line (- comint-buffer-maximum-size))
      (beginning-of-line)
!     (let ((inhibit-read-only t))
!       (delete-region (point-min) (point)))))
  
  (defun comint-strip-ctrl-m (&optional string)
    "Strip trailing `^M' characters from the current output group.