From: John Wiegley <johnw@newartisans.com>
Date: Mon, 7 Jun 2004 08:36:23 +0000 (+0000)
Subject: 2004-06-06  Emilio C. Lopes  <eclig@gmx.net>
X-Git-Tag: ttn-vms-21-2-B4~5890
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ac03c474d9bf561e06c78ace5ad1d021f8b5da66;p=emacs.git

2004-06-06  Emilio C. Lopes  <eclig@gmx.net>

	* eshell/esh-cmd.el (eshell/which): respect commands quoted with
	eshell-explicit-command-char
---

diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index 9b4f54ce8bf..477d8b410ec 100644
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -1246,9 +1246,8 @@ be finished later after the completion of an asynchronous subprocess."
 	(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)))
+	  (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