From: Glenn Morris <rgm@gnu.org>
Date: Mon, 24 Sep 2012 18:38:14 +0000 (-0400)
Subject: Improve previous eshell change
X-Git-Tag: emacs-24.2.90~244^2~99
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9a48e1689182ec87974c04429ca82f5015d6f5e2;p=emacs.git

Improve previous eshell change
---

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."
   (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)