diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/eshell/esh-cmd.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c1f205eeaf4..270d548b718 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-09-24 Glenn Morris <rgm@gnu.org> + + * eshell/esh-cmd.el (eshell-find-alias-function): + Tighten up file-name regexp. (Bug#12499) + 2012-09-24 Fabián Ezequiel Gallina <fgallina@cuca> Enhancements for triple-quote string syntax. diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el index 515a23f81d7..921f08e36f8 100644 --- a/lisp/eshell/esh-cmd.el +++ b/lisp/eshell/esh-cmd.el @@ -1218,7 +1218,8 @@ COMMAND may result in an alias being executed, or a plain command." ;; If the function exists, but is defined in an eshell module ;; that's not currently enabled, don't report it as found (if (and file - (string-match "\\(em\\|esh\\)-\\(.*\\)\\(\\.el\\)?\\'" file)) + (string-match "\\(em\\|esh\\)-\\([[:alnum:]]+\\)\\(\\.elc?\\)?\\'" + file)) (let ((module-sym (intern (file-name-base (concat "eshell-" (match-string 2 file)))))) (if (and (functionp sym) |