aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2000-04-29 19:28:46 +0000
committerGerd Moellmann2000-04-29 19:28:46 +0000
commitbbfc759111c34cd455f6ff0d3c2a6c0173e9ee58 (patch)
treeb121d990bff6594764a44bef9607ddfd877f5d7b
parent906d41a775981329b4478c2a75882c0aec9dda20 (diff)
downloademacs-bbfc759111c34cd455f6ff0d3c2a6c0173e9ee58.tar.gz
emacs-bbfc759111c34cd455f6ff0d3c2a6c0173e9ee58.zip
(normal-top-level): Put a condition-case around
the code loading subdirs.el.
-rw-r--r--lisp/startup.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index e2b227c7bfe..f410c5026cb 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -412,8 +412,9 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
412 new) 412 new)
413 (while tail 413 (while tail
414 (setq new (cons (car tail) new)) 414 (setq new (cons (car tail) new))
415 (let ((default-directory (car tail))) 415 (condition-case nil
416 (load (expand-file-name "subdirs.el" (car tail)) t t t)) 416 (let ((default-directory (car tail)))
417 (load (expand-file-name "subdirs.el" (car tail)) t t t)))
417 (setq tail (cdr tail)))) 418 (setq tail (cdr tail))))
418 (if (not (eq system-type 'vax-vms)) 419 (if (not (eq system-type 'vax-vms))
419 (progn 420 (progn