aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1999-07-05 16:00:07 +0000
committerRichard M. Stallman1999-07-05 16:00:07 +0000
commit9d1fb1792cbdfe71d0729eb56820d934483d8beb (patch)
treea910d4583d8a3dfdd3aac26744a158e255ec3262
parent0aeff9e00d04d0af5b32f0619f81b61ca7c45da9 (diff)
downloademacs-9d1fb1792cbdfe71d0729eb56820d934483d8beb.tar.gz
emacs-9d1fb1792cbdfe71d0729eb56820d934483d8beb.zip
(normal-top-level-add-subdirs-to-load-path): Avoid doing a `stat' when
it isn't necessary because that can cause trouble when an NFS server is down.
-rw-r--r--lisp/startup.el4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index b30bd450ea3..39286a56110 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -373,6 +373,10 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
373 (while contents 373 (while contents
374 (unless (member (car contents) '("." ".." "RCS" "CVS")) 374 (unless (member (car contents) '("." ".." "RCS" "CVS"))
375 (when (and (string-match "\\`[a-zA-Z0-9]" (car contents)) 375 (when (and (string-match "\\`[a-zA-Z0-9]" (car contents))
376 ;; Avoid doing a `stat' when it isn't necessary
377 ;; because that can cause trouble when an NFS server
378 ;; is down.
379 (not (string-match "\\.elc?\\'" (car contents)))
376 (file-directory-p (car contents))) 380 (file-directory-p (car contents)))
377 (let ((expanded (expand-file-name (car contents)))) 381 (let ((expanded (expand-file-name (car contents))))
378 (unless (file-exists-p (expand-file-name ".nosearch" 382 (unless (file-exists-p (expand-file-name ".nosearch"