(eval-when-compile): Don't lose if esh-module.el's file name

is truncated to DOS 8+3 limits.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0a16adc5b5b8703e2f95c84558d56e21a02073f8..bfe171fe673fbd43d58aacf21e6c10b381e9b530 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-02  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * eshell/esh-module.el (eval-when-compile): Don't lose if
+       esh-module.el's file name is truncated to DOS 8+3 limits.
+
 2000-09-01  John Wiegley  <johnw@gnu.org>
 
        * pcomplete.el (pcomplete-dirs-or-entries): Added a missing

diff --git a/lisp/eshell/esh-module.el b/lisp/eshell/esh-module.el
index fec608fc471800d526e79738b24989ce45f7e855..edc4cab050d4f5cc2aef6bc79f356214c0ae3de8 100644 (file)
--- a/lisp/eshell/esh-module.el
+++ b/lisp/eshell/esh-module.el
@@ -73,8 +73,18 @@ customizing the variable `eshell-modules-list'."
 (eval-when-compile
   (when (and (boundp 'byte-compile-current-file)
             byte-compile-current-file
-            (equal (file-name-nondirectory byte-compile-current-file)
-                   "esh-module.el"))
+            (or
+             (equal (file-name-nondirectory byte-compile-current-file)
+                    "esh-module.el")
+             ;; When eshell file names are expanded from a wildcard
+             ;; or by reading the Eshell directory, e.g. when they
+             ;; say "make recompile" in the lisp directory, Emacs on
+             ;; MS-DOS sees a truncated name "esh-modu.el" instead of
+             ;; "esh-module.el".
+             (and (fboundp 'msdos-long-file-names)
+                  (null (msdos-long-file-names))
+                  (equal (file-name-nondirectory byte-compile-current-file)
+                         "esh-modu.el"))))
     (let* ((directory (file-name-directory byte-compile-current-file))
            (elc-file (expand-file-name "esh-groups.elc" directory)))
       (eshell-load-defgroups directory)