changeset 31327:02375e0f6ea7

(eval-when-compile): Don't lose if esh-module.el's file name is truncated to DOS 8+3 limits.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 02 Sep 2000 05:34:42 +0000
parents a36c3cf583d4
children 548aceb8313d
files lisp/eshell/esh-module.el
diffstat 1 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/eshell/esh-module.el	Fri Sep 01 22:48:12 2000 +0000
+++ b/lisp/eshell/esh-module.el	Sat Sep 02 05:34:42 2000 +0000
@@ -73,8 +73,18 @@
 (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)