[Emacs-diffs] /srv/bzr/emacs/trunk r110183: * eshell/esh-cmd.el (eshell-find-alias-function): Tighten up file-name regexp.

[Glenn Morris]

------------------------------------------------------------
revno: 110183
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-09-24 14:22:10 -0400
message:
  * eshell/esh-cmd.el (eshell-find-alias-function): Tighten up file-name regexp.
modified:
  lisp/ChangeLog
  lisp/eshell/esh-cmd.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-24 17:54:46 +0000
+++ b/lisp/ChangeLog    2012-09-24 18:22:10 +0000
@@ -1,3 +1,8 @@
+2012-09-24  Glenn Morris  <address@hidden>
+
+       * eshell/esh-cmd.el (eshell-find-alias-function):
+       Tighten up file-name regexp.  (Bug#12499)
+
 2012-09-24  Fabián Ezequiel Gallina  <address@hidden>
 
        Enhancements for triple-quote string syntax.

=== modified file 'lisp/eshell/esh-cmd.el'
--- a/lisp/eshell/esh-cmd.el    2012-07-11 23:13:41 +0000
+++ b/lisp/eshell/esh-cmd.el    2012-09-24 18:22:10 +0000
@@ -1218,7 +1218,8 @@
     ;; 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)