mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-13 16:38:14 +00:00
Code Issues Releases Activity

(eshell-eval-command): If the return value of `eshell-resume-eval' is

Browse Source 
wrapped in a list, it indicates that the command was run
asynchronously.  In that case, unwrap the value before checking the
delimiter value.
This commit is contained in:
John Wiegley 2005-05-27 02:57:18 +00:00
parent 9c04140933
commit 6b6f91b357
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,5 +1,10 @@
2005-05-26 John Wiegley <johnw@newartisans.com>
* eshell/esh-cmd.el (eshell-eval-command): If the return value of
`eshell-resume-eval' is wrapped in a list, it indicates that the
command was run asynchronously. In that case, unwrap the value
before checking the delimiter value.
* eshell/em-cmpl.el (eshell-complete-parse-arguments): If the
character before a space at the end of a line is \, assume the
space is part of the last argument rather than a final argument

9
lisp/eshell/esh-cmd.el
View File

@ -757,7 +757,7 @@ nil)' if none)."
(defmacro eshell-do-subjob (object)
"Evaluate a command OBJECT as a subjob.
We indicate thet the process was run in the background by returned it
We indicate that the process was run in the background by returning it
ensconced in a list."
`(let ((eshell-current-subjob-p t))
,object))
@ -1006,11 +1006,10 @@ at the moment are:
(eshell-resume-eval))))
;; On systems that don't support async subprocesses, eshell-resume
;; can return t. Don't treat that as an error.
(if (listp delim)
(setq delim (car delim)))
(if (and delim (not (eq delim t)))
(error "Unmatched delimiter: %c"
(if (listp delim)
(car delim)
delim))))))
(error "Unmatched delimiter: %c" delim)))))
(defun eshell-resume-command (proc status)
"Resume the current command when a process ends."