summaryrefslogtreecommitdiff
path: root/lisp/eshell
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2001-04-24 20:48:14 +0000
committerJohn Wiegley <johnw@newartisans.com>2001-04-24 20:48:14 +0000
commit2e88b53c21d9f860609db533e9b367138b1c7733 (patch)
treed885bb5ebae71235cb734f9bb3268fd0bc074f7c /lisp/eshell
parentffeb5c1c4d32bc216f315d7e1704bd7b3e3277d8 (diff)
downloademacs-2e88b53c21d9f860609db533e9b367138b1c7733.tar.gz
(eshell-find-alias-function): Corrected the fix from last night, since
it wasn't finding eshell/cd.
Diffstat (limited to 'lisp/eshell')
-rw-r--r--lisp/eshell/esh-cmd.el6
1 files changed, 4 insertions, 2 deletions
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)