diff options
| author | Glenn Morris | 2012-09-24 14:38:14 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-09-24 14:38:14 -0400 |
| commit | 9a48e1689182ec87974c04429ca82f5015d6f5e2 (patch) | |
| tree | ae6646a1229af153a0b0342042d2f95baca6bf12 | |
| parent | 289c24bdfd92c06a726ebbb22e5a3c781227bd01 (diff) | |
| download | emacs-9a48e1689182ec87974c04429ca82f5015d6f5e2.tar.gz emacs-9a48e1689182ec87974c04429ca82f5015d6f5e2.zip | |
Improve previous eshell change
| -rw-r--r-- | lisp/eshell/esh-cmd.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el index 921f08e36f8..5a10721387b 100644 --- a/lisp/eshell/esh-cmd.el +++ b/lisp/eshell/esh-cmd.el | |||
| @@ -1216,12 +1216,12 @@ COMMAND may result in an alias being executed, or a plain command." | |||
| 1216 | (let* ((sym (intern-soft (concat "eshell/" name))) | 1216 | (let* ((sym (intern-soft (concat "eshell/" name))) |
| 1217 | (file (symbol-file sym 'defun))) | 1217 | (file (symbol-file sym 'defun))) |
| 1218 | ;; If the function exists, but is defined in an eshell module | 1218 | ;; If the function exists, but is defined in an eshell module |
| 1219 | ;; that's not currently enabled, don't report it as found | 1219 | ;; that's not currently enabled, don't report it as found. |
| 1220 | (if (and file | 1220 | (if (and file |
| 1221 | (string-match "\\(em\\|esh\\)-\\([[:alnum:]]+\\)\\(\\.elc?\\)?\\'" | 1221 | (setq file (file-name-base file)) |
| 1222 | file)) | 1222 | (string-match "\\`\\(em\\|esh\\)-\\([[:alnum:]]+\\)\\'" file)) |
| 1223 | (let ((module-sym | 1223 | (let ((module-sym |
| 1224 | (intern (file-name-base (concat "eshell-" (match-string 2 file)))))) | 1224 | (intern (concat "eshell-" (match-string 2 file))))) |
| 1225 | (if (and (functionp sym) | 1225 | (if (and (functionp sym) |
| 1226 | (or (null module-sym) | 1226 | (or (null module-sym) |
| 1227 | (eshell-using-module module-sym) | 1227 | (eshell-using-module module-sym) |