Mercurial > emacs

changeset 55968:db23082093f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2004-06-06 Emilio C. Lopes <eclig@gmx.net> * eshell/esh-cmd.el (eshell/which): respect commands quoted with eshell-explicit-command-char
author John Wiegley <johnw@newartisans.com>
date Mon, 07 Jun 2004 08:36:23 +0000
parents de68612fdbfb
children bbba5d83d7d3
files lisp/eshell/esh-cmd.el
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/eshell/esh-cmd.el	Mon Jun 07 08:36:07 2004 +0000
+++ b/lisp/eshell/esh-cmd.el	Mon Jun 07 08:36:23 2004 +0000
@@ -1246,9 +1246,8 @@
 	(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