From: John Wiegley <johnw@newartisans.com>
Date: Fri, 27 May 2005 02:57:18 +0000 (+0000)
Subject: (eshell-eval-command): If the return value of `eshell-resume-eval' is
X-Git-Tag: emacs-pretest-22.0.90~9505
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6b6f91b357f6fe2f1e0d72f046a1b8d8a2d6d8c3;p=emacs.git

(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 2795764f959..fd18c875ada 100644
--- 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 d7c65066ac6..355369d35ae 100644
--- 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."