[Emacs-diffs] Changes to emacs/lisp/eshell/esh-cmd.el

[John Wiegley]

Index: emacs/lisp/eshell/esh-cmd.el
diff -c emacs/lisp/eshell/esh-cmd.el:1.24 emacs/lisp/eshell/esh-cmd.el:1.25
*** emacs/lisp/eshell/esh-cmd.el:1.24   Mon Dec 27 16:16:24 2004
--- emacs/lisp/eshell/esh-cmd.el        Fri May 27 02:56:52 2005
***************
*** 757,763 ****
  
  (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
  ensconced in a list."
    `(let ((eshell-current-subjob-p t))
       ,object))
--- 757,763 ----
  
  (defmacro eshell-do-subjob (object)
    "Evaluate a command OBJECT as a subjob.
! 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,1016 ****
                   (eshell-resume-eval))))
        ;; 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)
!                  delim))))))
  
  (defun eshell-resume-command (proc status)
    "Resume the current command when a process ends."
--- 1006,1015 ----
                   (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" delim)))))
  
  (defun eshell-resume-command (proc status)
    "Resume the current command when a process ends."