diff options
| author | Richard M. Stallman | 1999-01-26 22:10:15 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1999-01-26 22:10:15 +0000 |
| commit | 95eada658d1ae6a4456e28b599655d582a207575 (patch) | |
| tree | d7573f5f4ef5040e2cf83d7ef4f976d1b4538734 /lisp | |
| parent | 7e8e59d0cd34abda9fd4f88a8072072738bb9d60 (diff) | |
| download | emacs-95eada658d1ae6a4456e28b599655d582a207575.tar.gz emacs-95eada658d1ae6a4456e28b599655d582a207575.zip | |
(command-line-1): Up-date copyright.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/startup.el | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 33e267ffe9f..3def4ed0876 100644 --- a/lisp/startup.el +++ b/lisp/startup.el | |||
| @@ -347,29 +347,36 @@ from being initialized." | |||
| 347 | 347 | ||
| 348 | (defvar init-file-had-error nil) | 348 | (defvar init-file-had-error nil) |
| 349 | 349 | ||
| 350 | (defvar normal-top-level-add-subdirs-inode-list nil) | ||
| 351 | |||
| 350 | (defun normal-top-level-add-subdirs-to-load-path () | 352 | (defun normal-top-level-add-subdirs-to-load-path () |
| 351 | "Add all subdirectories of current directory to `load-path'. | 353 | "Add all subdirectories of current directory to `load-path'. |
| 352 | More precisely, this uses only the subdirectories whose names | 354 | More precisely, this uses only the subdirectories whose names |
| 353 | start with letters or digits; it excludes any subdirectory named `RCS' | 355 | start with letters or digits; it excludes any subdirectory named `RCS' |
| 354 | or `CVS', and any subdirectory that contains a file named `.nosearch'." | 356 | or `CVS', and any subdirectory that contains a file named `.nosearch'." |
| 355 | (let (dirs | 357 | (let (dirs |
| 358 | attrs | ||
| 356 | (pending (list default-directory))) | 359 | (pending (list default-directory))) |
| 357 | ;; This loop does a breadth-first tree walk on DIR's subtree, | 360 | ;; This loop does a breadth-first tree walk on DIR's subtree, |
| 358 | ;; putting each subdir into DIRS as its contents are examined. | 361 | ;; putting each subdir into DIRS as its contents are examined. |
| 359 | (while pending | 362 | (while pending |
| 360 | (setq dirs (cons (car pending) dirs)) | 363 | (setq dirs (cons (car pending) dirs)) |
| 361 | (setq pending (cdr pending)) | 364 | (setq pending (cdr pending)) |
| 365 | (setq attrs (nthcdr 10 (file-attributes (car dirs)))) | ||
| 362 | (let ((contents (directory-files (car dirs))) | 366 | (let ((contents (directory-files (car dirs))) |
| 363 | (default-directory (car dirs))) | 367 | (default-directory (car dirs))) |
| 364 | (while contents | 368 | (unless (member attrs normal-top-level-add-subdirs-inode-list) |
| 365 | (unless (member (car contents) '("." ".." "RCS" "CVS")) | 369 | (setq normal-top-level-add-subdirs-inode-list |
| 366 | (when (and (string-match "\\`[a-zA-Z0-9]" (car contents)) | 370 | (cons attrs normal-top-level-add-subdirs-inode-list)) |
| 367 | (file-directory-p (car contents))) | 371 | (while contents |
| 368 | (let ((expanded (expand-file-name (car contents)))) | 372 | (unless (member (car contents) '("." ".." "RCS" "CVS")) |
| 369 | (unless (file-exists-p (expand-file-name ".nosearch" | 373 | (when (and (string-match "\\`[a-zA-Z0-9]" (car contents)) |
| 370 | expanded)) | 374 | (file-directory-p (car contents))) |
| 371 | (setq pending (nconc pending (list expanded))))))) | 375 | (let ((expanded (expand-file-name (car contents)))) |
| 372 | (setq contents (cdr contents))))) | 376 | (unless (file-exists-p (expand-file-name ".nosearch" |
| 377 | expanded)) | ||
| 378 | (setq pending (nconc pending (list expanded))))))) | ||
| 379 | (setq contents (cdr contents)))))) | ||
| 373 | (normal-top-level-add-to-load-path (cdr (nreverse dirs))))) | 380 | (normal-top-level-add-to-load-path (cdr (nreverse dirs))))) |
| 374 | 381 | ||
| 375 | ;; This function is called from a subdirs.el file. | 382 | ;; This function is called from a subdirs.el file. |
| @@ -871,7 +878,7 @@ Getting New Versions How to obtain the latest version of Emacs. | |||
| 871 | ") | 878 | ") |
| 872 | (insert "\n\n" (emacs-version) | 879 | (insert "\n\n" (emacs-version) |
| 873 | " | 880 | " |
| 874 | Copyright (C) 1998 Free Software Foundation, Inc.")) | 881 | Copyright (C) 1999 Free Software Foundation, Inc.")) |
| 875 | ;; If keys have their default meanings, | 882 | ;; If keys have their default meanings, |
| 876 | ;; use precomputed string to save lots of time. | 883 | ;; use precomputed string to save lots of time. |
| 877 | (if (and (eq (key-binding "\C-h") 'help-command) | 884 | (if (and (eq (key-binding "\C-h") 'help-command) |
| @@ -928,7 +935,7 @@ If you have no Meta key, you may instead type ESC followed by the character.)") | |||
| 928 | 935 | ||
| 929 | (insert "\n\n" (emacs-version) | 936 | (insert "\n\n" (emacs-version) |
| 930 | " | 937 | " |
| 931 | Copyright (C) 1998 Free Software Foundation, Inc.") | 938 | Copyright (C) 1999 Free Software Foundation, Inc.") |
| 932 | (if (and (eq (key-binding "\C-h\C-c") 'describe-copying) | 939 | (if (and (eq (key-binding "\C-h\C-c") 'describe-copying) |
| 933 | (eq (key-binding "\C-h\C-d") 'describe-distribution) | 940 | (eq (key-binding "\C-h\C-d") 'describe-distribution) |
| 934 | (eq (key-binding "\C-h\C-w") 'describe-no-warranty)) | 941 | (eq (key-binding "\C-h\C-w") 'describe-no-warranty)) |