diff options
| author | Glenn Morris | 2013-09-18 19:55:00 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-09-18 19:55:00 -0700 |
| commit | 390b7f9de6215917c6cf08e30ca898562d2517e3 (patch) | |
| tree | d071d25324ea3ffce079d771c131d7f3b1ec47a2 | |
| parent | 57a3a53d53bbe41dfb4341dc26c9335a61cc5f48 (diff) | |
| download | emacs-390b7f9de6215917c6cf08e30ca898562d2517e3.tar.gz emacs-390b7f9de6215917c6cf08e30ca898562d2517e3.zip | |
* eshell/esh-proc.el (eshell-reset-after-proc): Mark unused arg.
| -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 @@ | |||
| 14 | 14 | ||
| 15 | * eshell/em-smart.el (eshell-smart-scroll-window) | 15 | * eshell/em-smart.el (eshell-smart-scroll-window) |
| 16 | (eshell-disable-after-change): | 16 | (eshell-disable-after-change): |
| 17 | * eshell/em-term.el (eshell-term-sentinel): Mark unused arg. | 17 | * eshell/em-term.el (eshell-term-sentinel): |
| 18 | * eshell/esh-proc.el (eshell-reset-after-proc): Mark unused arg. | ||
| 18 | 19 | ||
| 19 | 2013-09-18 Alan Mackenzie <acm@muc.de> | 20 | 2013-09-18 Alan Mackenzie <acm@muc.de> |
| 20 | 21 | ||
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." | |||
| 133 | ; (define-key eshell-command-map [(control ?z)] 'eshell-stop-process) | 133 | ; (define-key eshell-command-map [(control ?z)] 'eshell-stop-process) |
| 134 | (define-key eshell-command-map [(control ?\\)] 'eshell-quit-process)) | 134 | (define-key eshell-command-map [(control ?\\)] 'eshell-quit-process)) |
| 135 | 135 | ||
| 136 | (defun eshell-reset-after-proc (proc status) | 136 | ;; This used to be on `eshell-kill-hook', which calls its functions |
| 137 | ;; with two arguments. Nowadays we call it directly in | ||
| 138 | ;; `eshell-kill-process-function', but in case anyone still has it | ||
| 139 | ;; on `eshell-kill-hook', _proc has to stay. | ||
| 140 | (defun eshell-reset-after-proc (_proc status) | ||
| 137 | "Reset the command input location after a process terminates. | 141 | "Reset the command input location after a process terminates. |
| 138 | The signals which will cause this to happen are matched by | 142 | The signals which will cause this to happen are matched by |
| 139 | `eshell-reset-signals'." | 143 | `eshell-reset-signals'." |