Revise previous esh-proc change

* eshell/esh-proc.el (eshell-kill-process-function):
Remove eshell-reset-after-proc from eshell-kill-hook if present.
(eshell-reset-after-proc): Remove unused arg `proc'.

2 files changed, 11 insertions, 10 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e2173ef57cc..97b22964601 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2013-09-19  Glenn Morris  <rgm@gnu.org>
 
+        * eshell/esh-proc.el (eshell-kill-process-function):
+        Remove eshell-reset-after-proc from eshell-kill-hook if present.
+        (eshell-reset-after-proc): Remove unused arg `proc'.
+
         * eshell/esh-util.el (eshell-read-hosts-file): Use `filename' arg.
         (directory-files-and-attributes): Mark unused arg.
 
@@ -14,8 +18,7 @@
 
         * eshell/em-smart.el (eshell-smart-scroll-window)
         (eshell-disable-after-change):
-        * eshell/em-term.el (eshell-term-sentinel):
-        * eshell/esh-proc.el (eshell-reset-after-proc): Mark unused arg.
+        * eshell/em-term.el (eshell-term-sentinel): Mark unused arg.
 
 2013-09-18  Alan Mackenzie  <acm@muc.de>
 
diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el
index b72e6328d64..ab7fd349893 100644
--- a/lisp/eshell/esh-proc.el
+++ b/lisp/eshell/esh-proc.el
@@ -116,9 +116,11 @@ information, for example."
 (defun eshell-kill-process-function (proc status)
   "Function run when killing a process.
 Runs `eshell-reset-after-proc' and `eshell-kill-hook', passing arguments
-PROC and STATUS to both."
-  (or (memq 'eshell-reset-after-proc eshell-kill-hook)
-      (eshell-reset-after-proc proc status))
+PROC and STATUS to functions on the latter."
+  ;; Was there till 24.1, but it is not optional.
+  (if (memq 'eshell-reset-after-proc eshell-kill-hook)
+      (setq eshell-kill-hook (delq 'eshell-reset-after-proc eshell-kill-hook)))
+  (eshell-reset-after-proc status)
   (run-hook-with-args 'eshell-kill-hook proc status))
 
 (defun eshell-proc-initialize ()
@@ -133,11 +135,7 @@ PROC and STATUS to both."
 ; (define-key eshell-command-map [(control ?z)]  'eshell-stop-process)
   (define-key eshell-command-map [(control ?\\)] 'eshell-quit-process))
 
-;; This used to be on `eshell-kill-hook', which calls its functions
-;; with two arguments.  Nowadays we call it directly in
-;; `eshell-kill-process-function', but in case anyone still has it
-;; on `eshell-kill-hook', _proc has to stay.
-(defun eshell-reset-after-proc (_proc status)
+(defun eshell-reset-after-proc (status)
   "Reset the command input location after a process terminates.
 The signals which will cause this to happen are matched by
 `eshell-reset-signals'."