(normal-top-level-add-subdirs-to-load-path): On Windows,

put into normal-top-level-add-subdirs-inode-list the
canonicalized names of the directories instead of inode numbers.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 55ad54cfcdd6f5f1c5a8cb7483234d4b7cee8a79..e8ab516e36f3c0b7b4050051c07a53ede71b73c4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-22  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * startup.el (normal-top-level-add-subdirs-to-load-path): On
+       Windows, put into normal-top-level-add-subdirs-inode-list the
+       canonicalized names of the directories instead of inode numbers.
+
 2001-07-21  Michael Kifer  <kifer@cs.sunysb.edu>
        
        * ediff-util.el: Copyright years.

diff --git a/lisp/startup.el b/lisp/startup.el
index b5b8089dfa90ee6b1d8a024874e7ed20ee2bcd84..6b82b2b7b013433e2bac4cf16baaa79c6ba3a883 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -352,9 +352,16 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
     (while pending
       (setq dirs (cons (car pending) dirs))
       (setq pending (cdr pending))
-      (setq attrs (nthcdr 10 (file-attributes (car dirs))))
-      (let ((contents (directory-files (car dirs)))
-           (default-directory (car dirs)))
+      (let* ((this-dir (car dirs))
+            (contents (directory-files this-dir))
+            (default-directory this-dir)
+            (canonicalized (and (eq system-type 'windows-nt)
+                                (untranslated-canonical-name this-dir))))
+       ;; The Windows version doesn't report meaningful inode
+       ;; numbers, so use the canonicalized absolute file name of the
+       ;; directory instead.
+       (setq attrs (or canonicalized
+                       (nthcdr 10 (file-attributes this-dir))))
        (unless (member attrs normal-top-level-add-subdirs-inode-list)
          (setq normal-top-level-add-subdirs-inode-list
                (cons attrs normal-top-level-add-subdirs-inode-list))