From: John Wiegley <johnw@newartisans.com>
Date: Tue, 24 Apr 2001 20:48:14 +0000 (+0000)
Subject: (eshell-find-alias-function): Corrected the fix from last night, since
X-Git-Tag: emacs-pretest-21.0.103~130
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2e88b53c21d9f860609db533e9b367138b1c7733;p=emacs.git

(eshell-find-alias-function): Corrected the fix from last night, since
it wasn't finding eshell/cd.
---

diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index 24b51a1f6b8..0b5cf0c8d26 100644
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -1293,8 +1293,10 @@ COMMAND may result in an alias being executed, or a plain command."
 	       (intern (file-name-sans-extension
 			(file-name-nondirectory
 			 (concat "eshell-" (match-string 2 file)))))))
-	  (if (and (eshell-using-module module-sym)
-		   (memq module-sym (eshell-subgroups 'eshell)))
+	  (if (and (functionp sym)
+		   (or (null module-sym)
+		       (eshell-using-module module-sym)
+		       (memq module-sym (eshell-subgroups 'eshell))))
 	      sym))
       ;; Otherwise, if it's bound, return it.
       (if (functionp sym)