Mercurial > emacs
changeset 38516:e3a84598fe88
(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.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sun, 22 Jul 2001 10:52:11 +0000 |
| parents | bc021306e722 |
| children | 42f3fecfa483 |
| files | lisp/startup.el |
| diffstat | 1 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/startup.el Sat Jul 21 08:21:55 2001 +0000 +++ b/lisp/startup.el Sun Jul 22 10:52:11 2001 +0000 @@ -352,9 +352,16 @@ (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))