diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/eshell/esh-proc.el | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5384713cb40..e2173ef57cc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -14,7 +14,8 @@ * eshell/em-smart.el (eshell-smart-scroll-window) (eshell-disable-after-change): - * eshell/em-term.el (eshell-term-sentinel): Mark unused arg. + * eshell/em-term.el (eshell-term-sentinel): + * eshell/esh-proc.el (eshell-reset-after-proc): 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 e77287c2f78..b72e6328d64 100644 --- a/lisp/eshell/esh-proc.el +++ b/lisp/eshell/esh-proc.el @@ -133,7 +133,11 @@ PROC and STATUS to both." ; (define-key eshell-command-map [(control ?z)] 'eshell-stop-process) (define-key eshell-command-map [(control ?\\)] 'eshell-quit-process)) -(defun eshell-reset-after-proc (proc status) +;; 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) "Reset the command input location after a process terminates. The signals which will cause this to happen are matched by `eshell-reset-signals'." |