[Emacs-diffs] Changes to emacs/lisp/eshell/esh-proc.el, v [EMACS_22_BASE]

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Glenn Morris <gm>       07/11/07 03:33:01

Index: esh-proc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/eshell/esh-proc.el,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -b -r1.15.2.1 -r1.15.2.2
--- esh-proc.el 25 Jul 2007 04:14:24 -0000      1.15.2.1
+++ esh-proc.el 7 Nov 2007 03:33:00 -0000       1.15.2.2
@@ -335,7 +335,7 @@
 PROC is the process for which we're inserting output.  STRING is the
 output."
   (when (buffer-live-p (process-buffer proc))
-    (set-buffer (process-buffer proc))
+    (with-current-buffer (process-buffer proc)
     (let ((entry (assq proc eshell-process-list)))
       (when entry
        (setcar (nthcdr 3 entry)
@@ -346,13 +346,13 @@
              (setcar (nthcdr 3 entry) nil)
              (setcar (nthcdr 4 entry) t)
              (eshell-output-object data nil (cadr entry))
-             (setcar (nthcdr 4 entry) nil))))))))
+               (setcar (nthcdr 4 entry) nil)))))))))
 
 (defun eshell-sentinel (proc string)
   "Generic sentinel for command processes.  Reports only signals.
 PROC is the process that's exiting.  STRING is the exit message."
   (when (buffer-live-p (process-buffer proc))
-    (set-buffer (process-buffer proc))
+    (with-current-buffer (process-buffer proc)
     (unwind-protect
        (let* ((entry (assq proc eshell-process-list)))
 ;        (if (not entry)
@@ -367,7 +367,7 @@
                    (eshell-close-handles (process-exit-status proc) 'nil
                                          (cadr entry))))
              (eshell-remove-process-entry entry))))
-      (run-hook-with-args 'eshell-kill-hook proc string))))
+       (run-hook-with-args 'eshell-kill-hook proc string)))))
 
 (defun eshell-process-interact (func &optional all query)
   "Interact with a process, using PROMPT if more than one, via FUNC.