[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.22 emacs/lisp/eshell/esh-cmd.el:1.23
*** emacs/lisp/eshell/esh-cmd.el:1.22   Fri Mar 26 07:03:27 2004
--- emacs/lisp/eshell/esh-cmd.el        Mon Jun  7 08:36:23 2004
***************
*** 1246,1254 ****
        (setq program (eshell-search-path name))
        (let* ((esym (eshell-find-alias-function name))
               (sym (or esym (intern-soft name))))
!         (if (and sym (fboundp sym)
!                  (or esym eshell-prefer-lisp-functions
!                      (not program)))
              (let ((desc (let ((inhibit-redisplay t))
                            (save-window-excursion
                              (prog1
--- 1246,1253 ----
        (setq program (eshell-search-path name))
        (let* ((esym (eshell-find-alias-function name))
               (sym (or esym (intern-soft name))))
!         (if (and (or esym (and sym (fboundp sym)))
!                  (or eshell-prefer-lisp-functions (not direct)))
              (let ((desc (let ((inhibit-redisplay t))
                            (save-window-excursion
                              (prog1