From: Eli Zaretskii Date: Sun, 22 Jul 2001 10:53:30 +0000 (+0000) Subject: (normal-top-level-add-subdirs-to-load-path): On Windows, X-Git-Tag: emacs-pretest-21.0.105~421 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=722a451d1ae7ddb86449b20c9e2d6551f08d4f8a;p=emacs.git (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 55ad54cfcdd..e8ab516e36f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2001-07-22 Eli Zaretskii + + * 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 * ediff-util.el: Copyright years. diff --git a/lisp/startup.el b/lisp/startup.el index b5b8089dfa9..6b82b2b7b01 100644 --- 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))