diff options
Diffstat (limited to 'lisp/eshell/esh-cmd.el')
| -rw-r--r-- | lisp/eshell/esh-cmd.el | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el index d7c65066ac6..355369d35ae 100644 --- a/lisp/eshell/esh-cmd.el +++ b/lisp/eshell/esh-cmd.el | |||
| @@ -757,7 +757,7 @@ nil)' if none)." | |||
| 757 | 757 | ||
| 758 | (defmacro eshell-do-subjob (object) | 758 | (defmacro eshell-do-subjob (object) |
| 759 | "Evaluate a command OBJECT as a subjob. | 759 | "Evaluate a command OBJECT as a subjob. |
| 760 | We indicate thet the process was run in the background by returned it | 760 | We indicate that the process was run in the background by returning it |
| 761 | ensconced in a list." | 761 | ensconced in a list." |
| 762 | `(let ((eshell-current-subjob-p t)) | 762 | `(let ((eshell-current-subjob-p t)) |
| 763 | ,object)) | 763 | ,object)) |
| @@ -1006,11 +1006,10 @@ at the moment are: | |||
| 1006 | (eshell-resume-eval)))) | 1006 | (eshell-resume-eval)))) |
| 1007 | ;; On systems that don't support async subprocesses, eshell-resume | 1007 | ;; On systems that don't support async subprocesses, eshell-resume |
| 1008 | ;; can return t. Don't treat that as an error. | 1008 | ;; can return t. Don't treat that as an error. |
| 1009 | (if (listp delim) | ||
| 1010 | (setq delim (car delim))) | ||
| 1009 | (if (and delim (not (eq delim t))) | 1011 | (if (and delim (not (eq delim t))) |
| 1010 | (error "Unmatched delimiter: %c" | 1012 | (error "Unmatched delimiter: %c" delim))))) |
| 1011 | (if (listp delim) | ||
| 1012 | (car delim) | ||
| 1013 | delim)))))) | ||
| 1014 | 1013 | ||
| 1015 | (defun eshell-resume-command (proc status) | 1014 | (defun eshell-resume-command (proc status) |
| 1016 | "Resume the current command when a process ends." | 1015 | "Resume the current command when a process ends." |