diff options
| -rw-r--r-- | lisp/loadup.el | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index 58675263e28..a1252eca989 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el | |||
| @@ -32,6 +32,26 @@ | |||
| 32 | ;;; We don't want to have any undo records in the dumped Emacs. | 32 | ;;; We don't want to have any undo records in the dumped Emacs. |
| 33 | (buffer-disable-undo "*scratch*") | 33 | (buffer-disable-undo "*scratch*") |
| 34 | 34 | ||
| 35 | ;; Write a file subdirs.el into the Lisp directory | ||
| 36 | ;; containing the names of the subdirs of that directory | ||
| 37 | ;; which we should check for Lisp files. | ||
| 38 | (message "Writing subdirs.el...") | ||
| 39 | (let ((files (directory-files "../lisp/" nil nil t)) | ||
| 40 | new) | ||
| 41 | (while files | ||
| 42 | (if (and (null (member (car files) '("." ".." "term" "RCS"))) | ||
| 43 | (null (string-match "\\.elc?$" (car files))) | ||
| 44 | (file-directory-p (expand-file-name (car files) "../lisp/"))) | ||
| 45 | (setq new (cons (car files) new))) | ||
| 46 | (setq files (cdr files))) | ||
| 47 | (insert ";; In load-path, after this directory should come\n") | ||
| 48 | (insert ";; certain of its subdirectories. Here we specify them.\n") | ||
| 49 | (prin1 (list 'normal-top-level-add-to-load-path | ||
| 50 | (list 'quote new)) (current-buffer)) | ||
| 51 | (write-region (point-min) (point-max) | ||
| 52 | (expand-file-name "subdirs.el" "../lisp/")) | ||
| 53 | (erase-buffer)) | ||
| 54 | |||
| 35 | (load "subr") | 55 | (load "subr") |
| 36 | (garbage-collect) | 56 | (garbage-collect) |
| 37 | (load "byte-run") | 57 | (load "byte-run") |
| @@ -114,27 +134,6 @@ | |||
| 114 | (garbage-collect) | 134 | (garbage-collect) |
| 115 | (load "vc-hooks") | 135 | (load "vc-hooks") |
| 116 | 136 | ||
| 117 | ;; Write a file subdirs.el into the Lisp directory | ||
| 118 | ;; containing the names of the subdirs of that directory | ||
| 119 | ;; which we should check for Lisp files. | ||
| 120 | (message "Writing subdirs.el...") | ||
| 121 | (let ((files (directory-files "../lisp/" nil nil t)) | ||
| 122 | (buffer-undo-list t) | ||
| 123 | new) | ||
| 124 | (while files | ||
| 125 | (if (and (not (member (car files) '("." ".." "term" "RCS"))) | ||
| 126 | (not (string-match "\\.elc?$" (car files))) | ||
| 127 | (file-directory-p (expand-file-name (car files) "../lisp/"))) | ||
| 128 | (setq new (cons (car files) new))) | ||
| 129 | (setq files (cdr files))) | ||
| 130 | (insert ";; In load-path, after this directory should come\n") | ||
| 131 | (insert ";; certain of its subdirectories. Here we specify them.\n") | ||
| 132 | (prin1 (list 'normal-top-level-add-to-load-path | ||
| 133 | (list 'quote new)) (current-buffer)) | ||
| 134 | (write-region (point-min) (point-max) | ||
| 135 | (expand-file-name "subdirs.el" "../lisp/")) | ||
| 136 | (erase-buffer)) | ||
| 137 | |||
| 138 | ;; We specify .el in case someone compiled version.el by mistake. | 137 | ;; We specify .el in case someone compiled version.el by mistake. |
| 139 | (load "version.el") | 138 | (load "version.el") |
| 140 | 139 | ||