(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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2795764f959b9b0a209cae28274d938cf0950d52..fd18c875ada5c1b0deae9452c43b3b953ed78cdb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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

diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index d7c65066ac6a2cc7443ff070dcd5de26e41c7cab..355369d35aef32af4b1e3e2df78ad55786d3dac0 100644 (file)
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -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."