(eshell-eval-command): If eshell-resume-eval

returns t, don't treat that as an error.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 02d9a949e40a95b8837bf1da0b594ecad039ef5b..ce93a6c126f69e9321da6b24faa5b06d64164c4a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-26  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * eshell/esh-cmd.el (eshell-eval-command): If eshell-resume-eval
+       returns t, don't treat that as an error.
+
 2002-01-25  Jason Rumney  <jasonr@gnu.org>
 
        * faces.el (face-font-registry-alternatives) [windows-nt]: Add

diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index c5c61d311ed1ee6ffd3392d58a3d331bd2dd5506..7793f87e4ebb42697afb403e5c1e732df6a53633 100644 (file)
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -1008,7 +1008,9 @@ at the moment are:
     (setq eshell-current-command command)
     (let ((delim (catch 'eshell-incomplete
                   (eshell-resume-eval))))
-      (if delim
+      ;; On systems that don't support async subprocesses, eshell-resume
+      ;; can return t.  Don't treat that as an error.
+      (if (and delim (not (eq delim t)))
          (error "Unmatched delimiter: %c"
                 (if (listp delim)
                     (car delim)