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

[Richard M. Stallman]

Index: emacs/lisp/comint.el
diff -c emacs/lisp/comint.el:1.260 emacs/lisp/comint.el:1.261
*** emacs/lisp/comint.el:1.260  Wed Jan 16 20:41:11 2002
--- emacs/lisp/comint.el        Fri Jan 18 18:25:16 2002
***************
*** 3164,3215 ****
                           process))
         (proc (get-buffer-process process-buffer)))
      ;; Change to the process buffer
!     (set-buffer process-buffer)
  
!     ;; Make sure there's a prompt in the current process buffer
!     (and comint-redirect-perform-sanity-check
!        (save-excursion
!          (goto-char (point-max))
!          (or (re-search-backward comint-prompt-regexp nil t)
!              (error "No prompt found or `comint-prompt-regexp' not set 
properly"))))
  
      ;;;;;;;;;;;;;;;;;;;;;
!     ;; Set up for redirection
      ;;;;;;;;;;;;;;;;;;;;;
!     (comint-redirect-setup
!      ;; Output Buffer
!      output-buffer
!      ;; Comint Buffer
!      (current-buffer)
!      ;; Finished Regexp
!      comint-prompt-regexp
!      ;; Echo input
!      echo)
  
      ;;;;;;;;;;;;;;;;;;;;;
!     ;; Set the filter
      ;;;;;;;;;;;;;;;;;;;;;
!     ;; Save the old filter
!     (setq comint-redirect-original-filter-function
!         (process-filter proc))
!     (set-process-filter proc 'comint-redirect-filter)
  
      ;;;;;;;;;;;;;;;;;;;;;
!     ;; Send the command
      ;;;;;;;;;;;;;;;;;;;;;
!     (process-send-string
!      (current-buffer)
!      (concat command "\n"))
  
      ;;;;;;;;;;;;;;;;;;;;;
!     ;; Show the output
      ;;;;;;;;;;;;;;;;;;;;;
!     (or no-display
!        (display-buffer
!         (get-buffer-create
!          (if (listp output-buffer)
!              (car output-buffer)
!            output-buffer))))))
  
  ;;;###autoload
  (defun comint-redirect-results-list (command regexp regexp-group)
--- 3164,3215 ----
                           process))
         (proc (get-buffer-process process-buffer)))
      ;; Change to the process buffer
!     (with-current-buffer process-buffer
  
!       ;; Make sure there's a prompt in the current process buffer
!       (and comint-redirect-perform-sanity-check
!          (save-excursion
!            (goto-char (point-max))
!            (or (re-search-backward comint-prompt-regexp nil t)
!                (error "No prompt found or `comint-prompt-regexp' not set 
properly"))))
  
      ;;;;;;;;;;;;;;;;;;;;;
!       ;; Set up for redirection
      ;;;;;;;;;;;;;;;;;;;;;
!       (comint-redirect-setup
!        ;; Output Buffer
!        output-buffer
!        ;; Comint Buffer
!        (current-buffer)
!        ;; Finished Regexp
!        comint-prompt-regexp
!        ;; Echo input
!        echo)
  
      ;;;;;;;;;;;;;;;;;;;;;
!       ;; Set the filter
      ;;;;;;;;;;;;;;;;;;;;;
!       ;; Save the old filter
!       (setq comint-redirect-original-filter-function
!           (process-filter proc))
!       (set-process-filter proc 'comint-redirect-filter)
  
      ;;;;;;;;;;;;;;;;;;;;;
!       ;; Send the command
      ;;;;;;;;;;;;;;;;;;;;;
!       (process-send-string
!        (current-buffer)
!        (concat command "\n"))
  
      ;;;;;;;;;;;;;;;;;;;;;
!       ;; Show the output
      ;;;;;;;;;;;;;;;;;;;;;
!       (or no-display
!         (display-buffer
!          (get-buffer-create
!           (if (listp output-buffer)
!               (car output-buffer)
!             output-buffer)))))))
  
  ;;;###autoload
  (defun comint-redirect-results-list (command regexp regexp-group)