[Emacs-diffs] /srv/bzr/emacs/trunk r110184: Improve previous eshell change

[Glenn Morris]

------------------------------------------------------------
revno: 110184
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-09-24 14:38:14 -0400
message:
  Improve previous eshell change
modified:
  lisp/eshell/esh-cmd.el

=== modified file 'lisp/eshell/esh-cmd.el'
--- a/lisp/eshell/esh-cmd.el    2012-09-24 18:22:10 +0000
+++ b/lisp/eshell/esh-cmd.el    2012-09-24 18:38:14 +0000
@@ -1216,12 +1216,12 @@
   (let* ((sym (intern-soft (concat "eshell/" name)))
         (file (symbol-file sym 'defun)))
     ;; If the function exists, but is defined in an eshell module
-    ;; that's not currently enabled, don't report it as found
+    ;; that's not currently enabled, don't report it as found.
     (if (and file
-            (string-match "\\(em\\|esh\\)-\\([[:alnum:]]+\\)\\(\\.elc?\\)?\\'"
-                          file))
+            (setq file (file-name-base file))
+            (string-match "\\`\\(em\\|esh\\)-\\([[:alnum:]]+\\)\\'" file))
        (let ((module-sym
-              (intern (file-name-base (concat "eshell-" (match-string 2 
file))))))
+              (intern (concat "eshell-" (match-string 2 file)))))
          (if (and (functionp sym)
                   (or (null module-sym)
                       (eshell-using-module module-sym)