Merge from emacs--devo--0

[bpt/emacs.git] / lisp / eshell / esh-proc.el

diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el
index 530eb9c..a838da3 100644 (file)
--- a/lisp/eshell/esh-proc.el
+++ b/lisp/eshell/esh-proc.el
@@ -1,7 +1,7 @@
 ;;; esh-proc.el --- process management
 
-;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -22,9 +22,13 @@
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 
+;;; Commentary:
+
 (provide 'esh-proc)
 
-(eval-when-compile (require 'esh-maint))
+(eval-when-compile
+  (require 'eshell)
+  (require 'esh-util))
 
 (defgroup eshell-proc nil
   "When Eshell invokes external commands, it always does so
@@ -33,8 +37,6 @@ finish."
   :tag "Process management"
   :group 'eshell)
 
-;;; Commentary:
-
 ;;; User Variables:
 
 (defcustom eshell-proc-load-hook '(eshell-proc-initialize)
@@ -181,7 +183,7 @@ The signals which will cause this to happen are matched by
            (setq signum (abs (string-to-number id))))
           ((stringp id)
            (let (case-fold-search)
-             (if (string-match "^-\\([A-Z]+\\)$" id)
+             (if (string-match "^-\\([A-Z]+[12]?\\)$" id)
                  (setq signum
                        (intern (concat "SIG" (match-string 1 id))))
                (error "kill: bad signal spec `%s'" id))))
@@ -335,39 +337,39 @@ Used only on systems which do not support async subprocesses.")
 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))
-    (let ((entry (assq proc eshell-process-list)))
-      (when entry
-       (setcar (nthcdr 3 entry)
-               (concat (nth 3 entry) string))
-       (unless (nth 4 entry)           ; already being handled?
-         (while (nth 3 entry)
-           (let ((data (nth 3 entry)))
-             (setcar (nthcdr 3 entry) nil)
-             (setcar (nthcdr 4 entry) t)
-             (eshell-output-object data nil (cadr entry))
-             (setcar (nthcdr 4 entry) nil))))))))
+    (with-current-buffer (process-buffer proc)
+      (let ((entry (assq proc eshell-process-list)))
+       (when entry
+         (setcar (nthcdr 3 entry)
+                 (concat (nth 3 entry) string))
+         (unless (nth 4 entry)         ; already being handled?
+           (while (nth 3 entry)
+             (let ((data (nth 3 entry)))
+               (setcar (nthcdr 3 entry) nil)
+               (setcar (nthcdr 4 entry) t)
+               (eshell-output-object data nil (cadr entry))
+               (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))
-    (unwind-protect
-       (let* ((entry (assq proc eshell-process-list)))
-;        (if (not entry)
-;            (error "Sentinel called for unowned process `%s'"
-;                   (process-name proc))
-         (when entry
-           (unwind-protect
-               (progn
-                 (unless (string= string "run")
-                   (unless (string-match "^\\(finished\\|exited\\)" string)
-                     (eshell-insertion-filter proc string))
-                   (eshell-close-handles (process-exit-status proc) 'nil
-                                         (cadr entry))))
-             (eshell-remove-process-entry entry))))
-      (run-hook-with-args 'eshell-kill-hook proc string))))
+    (with-current-buffer (process-buffer proc)
+      (unwind-protect
+         (let* ((entry (assq proc eshell-process-list)))
+;          (if (not entry)
+;              (error "Sentinel called for unowned process `%s'"
+;                     (process-name proc))
+           (when entry
+             (unwind-protect
+                 (progn
+                   (unless (string= string "run")
+                     (unless (string-match "^\\(finished\\|exited\\)" string)
+                       (eshell-insertion-filter proc string))
+                     (eshell-close-handles (process-exit-status proc) 'nil
+                                           (cadr entry))))
+               (eshell-remove-process-entry entry))))
+       (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.